[elpa] externals/org d9d5594 66/85: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit d9d5594c248f51640ea7ae28e716ee86f9458085
Merge: c21dceb 1f3722c
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master'
---
 lisp/ob-table.el     |  3 ++-
 lisp/org-agenda.el   |  5 +++--
 lisp/org-protocol.el | 15 ++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 39a14a2..e081708 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -78,7 +78,8 @@ So this `org-sbe' construct
 
 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
  #+end_src
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 88e0287..e9ca5f2 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1232,7 +1232,8 @@ For example, 9:30am would become 09:30 rather than  9:30."
      ":" minute ampm)))
 
 (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
       (org-agenda-time-of-day-to-ampm time)
     time))
@@ -4592,7 +4593,7 @@ is active."
                      'org-todo-regexp org-todo-regexp
                      'org-complex-heading-regexp org-complex-heading-regexp
                      'mouse-face 'highlight
-                     'help-echo (format "mouse-2 or RET jump to location")))
+                     'help-echo "mouse-2 or RET jump to location"))
         (full-words org-agenda-search-view-force-full-words)
         (org-agenda-text-search-extra-files org-agenda-text-search-extra-files)
         regexp rtn rtnall files file pos inherited-tags
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 30f5bc0..e4578d4 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -178,11 +178,11 @@ Possible properties are:
   :working-suffix    - the replacement for online-suffix
   :base-url          - the base URL, e.g. https://www.example.com/project/
                        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:
 
@@ -216,8 +216,9 @@ Example:
    does not include any suffix properties, allowing local source
    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
   :type 'alist)