Browse Source

Backport commit c78e16962 from Emacs

; Adjust overly long docstrings to fit 80 characters
c78e16962e63895d340f80cf245fad568a7da770
Stefan Kangas
Sun Sep 26 13:23:57 2021 +0200
Stefan Kangas 4 years ago
parent
commit
1f3722c6b5
3 changed files with 12 additions and 9 deletions
  1. 2 1
      lisp/ob-table.el
  2. 2 1
      lisp/org-agenda.el
  3. 8 7
      lisp/org-protocol.el

+ 2 - 1
lisp/ob-table.el

@@ -78,7 +78,8 @@ So this `org-sbe' construct
 
 
 is the equivalent of the following source code block:
 is the equivalent of the following source code block:
 
 
- #+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) :results silent
+ #+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) \\
+     :results silent
  results
  results
  #+end_src
  #+end_src
 
 

+ 2 - 1
lisp/org-agenda.el

@@ -1230,7 +1230,8 @@ For example, 9:30am would become 09:30 rather than  9:30."
      ":" minute ampm)))
      ":" minute ampm)))
 
 
 (defun org-agenda-time-of-day-to-ampm-maybe (time)
 (defun org-agenda-time-of-day-to-ampm-maybe (time)
-  "Conditionally convert TIME to AM/PM format based on `org-agenda-timegrid-use-ampm'."
+  "Conditionally convert TIME to AM/PM format.
+This is based on `org-agenda-timegrid-use-ampm'."
   (if org-agenda-timegrid-use-ampm
   (if org-agenda-timegrid-use-ampm
       (org-agenda-time-of-day-to-ampm time)
       (org-agenda-time-of-day-to-ampm time)
     time))
     time))

+ 8 - 7
lisp/org-protocol.el

@@ -178,11 +178,11 @@ Possible properties are:
   :working-suffix    - the replacement for online-suffix
   :working-suffix    - the replacement for online-suffix
   :base-url          - the base URL, e.g. http://www.example.com/project/
   :base-url          - the base URL, e.g. http://www.example.com/project/
                        Last slash required.
                        Last slash required.
-  :working-directory - the local working directory.  This is, what base-url will
-                       be replaced with.
-  :redirects         - A list of cons cells, each of which maps a regular
-                       expression to match to a path relative to
-                       :working-directory.
+  :working-directory - the local working directory.  This is what
+                       base-url will be replaced with.
+  :redirects         - A list of cons cells, each of which maps a
+                       regular expression to match to a path relative
+                       to `:working-directory'.
 
 
 Example:
 Example:
 
 
@@ -216,8 +216,9 @@ Example:
    does not include any suffix properties, allowing local source
    does not include any suffix properties, allowing local source
    file to be opened as found by OpenGrok.
    file to be opened as found by OpenGrok.
 
 
-Consider using the interactive functions `org-protocol-create' and
-`org-protocol-create-for-org' to help you filling this variable with valid contents."
+Consider using the interactive functions `org-protocol-create'
+and `org-protocol-create-for-org' to help you filling this
+variable with valid contents."
   :group 'org-protocol
   :group 'org-protocol
   :type 'alist)
   :type 'alist)