[elpa] externals/org c75aec4e6c 2/3: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit c75aec4e6c735b47be4d6253243643db4c9a4f75
Merge: 7f4d91040a 529c2a3df1
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master'
---
 lisp/ob-R.el           | 2 +-
 lisp/org-clock.el      | 3 +--
 lisp/org-element.el    | 2 +-
 lisp/org-id.el         | 2 +-
 lisp/org-protocol.el   | 2 +-
 lisp/ox-koma-letter.el | 4 ++--
 lisp/ox-odt.el         | 6 ++----
 lisp/ox.el             | 2 +-
 8 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 0d9a40b89b..f68b5b44e4 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -536,7 +536,7 @@ by `org-babel-comint-async-filter'."
 
 (defun ob-session-async-R-value-callback (params tmp-file)
   "Callback for async value results.
-Assigned locally to `ob-session-async-file-callback' in R
+Assigned locally to `org-babel-comint-async-file-callback' in R
 comint buffers used for asynchronous Babel evaluation."
   (let* ((graphics-file (and (member "graphics" (assq :result-params params))
                             (org-babel-graphical-output-file params)))
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 604b5481c8..2758aeed40 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -433,8 +433,7 @@ When `org-clock-clocked-in-display' is set to `frame-title'
 or `both', clocking in will replace `frame-title-format' with
 this value.  Clocking out will restore `frame-title-format'.
 
-`org-frame-title-string' is a format string using the same
-specifications than `frame-title-format', which see."
+This uses the same format as `frame-title-format', which see."
   :version "24.1"
   :group 'org-clock
   :type 'sexp)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 74b625c5bd..bc2fa0b985 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -193,7 +193,7 @@ is not sufficient to know if point is at a paragraph 
ending.  See
 (defvar org-element--object-regexp nil
   "Regexp possibly matching the beginning of an object.
 This regexp allows false positives.  Dedicated parser (e.g.,
-`org-export-bold-parser') will take care of further filtering.
+`org-element-bold-parser') will take care of further filtering.
 Radio links are not matched by this regexp, as they are treated
 specially in `org-element--object-lex'.")
 
diff --git a/lisp/org-id.el b/lisp/org-id.el
index ee1ce8ca43..8cb5666a29 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -599,7 +599,7 @@ If SILENT is non-nil, messages are suppressed."
                        (setf (car item) (expand-file-name (car item) loc))))
                    org-id-locations)))
        (error
-        (message "Could not read `org-id-locations' from %s, setting it to nil"
+         (message "Could not read `org-id-locations' from %s, setting it to 
nil"
                  org-id-locations-file))))
     (setq org-id-files (mapcar 'car org-id-locations))
     (setq org-id-locations (org-id-alist-to-hash org-id-locations))))
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 3d390dbe43..9ce21cf2ac 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -688,7 +688,7 @@ to deal with new-style links.")
 
 (advice-add 'server-visit-files :around #'org--protocol-detect-protocol-server)
 (defun org--protocol-detect-protocol-server (orig-fun files client &rest args)
-  "Advice server-visit-flist to call 
`org-protocol-modify-filename-for-protocol'."
+  "Advice server-visit-flist to call 
`org-protocol-check-filename-for-protocol'."
   (let ((flist (if org-protocol-reverse-list-of-files
                    (reverse files)
                  files)))
diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el
index 258452fc51..a6cfb24a9e 100644
--- a/lisp/ox-koma-letter.el
+++ b/lisp/ox-koma-letter.el
@@ -35,7 +35,7 @@
 ;; `org-koma-letter-export-to-pdf' ("pdf" file).
 ;;
 ;; On top of buffer keywords supported by `latex' back-end (see
-;; `org-latex-options-alist'), this back-end introduces the following
+;; `org-latex-packages-alist'), this back-end introduces the following
 ;; keywords:
 ;;   - CLOSING: see `org-koma-letter-closing',
 ;;   - FROM_ADDRESS: see `org-koma-letter-from-address',
@@ -66,7 +66,7 @@
 ;;   - from-logo (see `org-koma-letter-use-from-logo')
 ;;   - email (see `org-koma-letter-use-email')
 ;;   - place (see `org-koma-letter-use-place')
-;;   - location (see `org-koma-letter-use-location')
+;;   - location (see `org-koma-letter-location')
 ;;   - subject, a list of format options
 ;;     (see `org-koma-letter-subject-format')
 ;;   - after-closing-order, a list of the ordering of headings with
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index b3b0b2f78c..402c754471 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -3248,8 +3248,7 @@ Return a cons of (TABLE-CELL-STYLE-NAME . 
PARAGRAPH-STYLE-NAME).
 When STYLE-SPEC is nil, style the table cell the conventional way
 - choose cell borders based on row and column groupings and
 choose paragraph alignment based on `org-col-cookies' text
-property.  See also
-`org-odt-get-paragraph-style-cookie-for-table-cell'.
+property.  See also `org-odt-table-style-spec'.
 
 When STYLE-SPEC is non-nil, ignore the above cookie and return
 styles congruent with the ODF-1.2 specification."
@@ -3594,8 +3593,7 @@ pertaining to indentation here."
     ;;   item, but also within description lists and low-level
     ;;   headlines.
 
-    ;; See `org-odt-translate-description-lists' and
-    ;; `org-odt-translate-low-level-headlines' for how this is
+    ;; See `org-odt--translate-description-lists' for how this is
     ;; tackled.
 
     (concat "\n"
diff --git a/lisp/ox.el b/lisp/ox.el
index 1fa4066594..22df887593 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6471,7 +6471,7 @@ to `:default' encoding.  If it fails, return S."
 ;;
 ;; Export Stack is viewed through a dedicated major mode
 ;;`org-export-stack-mode' and tools: `org-export-stack-refresh',
-;;`org-export-stack-delete', `org-export-stack-view' and
+;;`org-export-stack-remove', `org-export-stack-view' and
 ;;`org-export-stack-clear'.
 ;;
 ;; For back-ends, `org-export-add-to-stack' add a new source to stack.