[elpa] externals-release/org de060c36d4 3/3: Merge branch 'km/from-emacs-29' into bugfix

[ELPA Syncer]

branch: externals-release/org
commit de060c36d41d32f0a639e9473c2e9a50ddbeba77
Merge: 25c786f0fb 50183ada86
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-29' into bugfix
---
 lisp/org-element.el   |  2 +-
 lisp/org-fold-core.el |  2 +-
 lisp/org-macs.el      |  2 +-
 lisp/ox-latex.el      | 11 ++++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index ff587bba38..796191dd38 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -6556,7 +6556,7 @@ the expected result."
                    (error "org-element: Parsing aborted by user.  Cache has 
been cleared.
 If you observe Emacs hangs frequently, please report this to Org mode mailing 
list (M-x org-submit-bug-report)."))
                  (message (substitute-command-keys
-                           "`org-element--parse-buffer': Suppressed 
`\\[keyboard-quit]'.  Press `\\[keyboard-quit]' %d more times to force 
interruption.")
+                           "`org-element--parse-to': Suppressed 
`\\[keyboard-quit]'.  Press `\\[keyboard-quit]' %d more times to force 
interruption.")
                           (- org-element--cache-interrupt-C-g-max-count
                              org-element--cache-interrupt-C-g-count)))
               (unless element
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 73b3c9bbf8..be90ca398a 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -433,7 +433,7 @@ Return nil when there is no matching folding spec."
   (org-fold-core-get-folding-spec-from-alias spec-or-alias))
 
 (defsubst org-fold-core--check-spec (spec-or-alias)
-  "Throw an error if SPEC-OR-ALIAS is not in 
`org-fold-core--spec-priority-list'."
+  "Throw an error if SPEC-OR-ALIAS is not in 
`org-fold-core-folding-spec-list'."
   (unless (org-fold-core-folding-spec-p spec-or-alias)
     (error "%s is not a valid folding spec" spec-or-alias)))
 
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 5554183478..b891284a8b 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -1072,7 +1072,7 @@ Return width in pixels when PIXELS is non-nil."
       ;; FIXME: Fallback to old limited version, because
       ;; `window-pixel-width' is buggy in older Emacs.
       (org--string-width-1 string)
-    ;; Wrap/line prefix will make `window-text-pizel-size' return too
+    ;; Wrap/line prefix will make `window-text-pixel-size' return too
     ;; large value including the prefix.
     (remove-text-properties 0 (length string)
                             '(wrap-prefix t line-prefix t)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 9989a9bae5..c83728a8f0 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -978,7 +978,7 @@ The most comprehensive option can be set with,
 which causes source code to be run through
 `engrave-faces-latex-buffer', which generates colorings using
 Emacs' font-lock information.  This requires the Emacs package
-engrave-faces (available from ELPA), and the LaTeX package
+engrave-faces (available from GNU ELPA), and the LaTeX package
 fvextra be installed.
 
 The styling of the engraved result can be customized with
@@ -1262,9 +1262,10 @@ block-specific options, you may use the following syntax:
 
 (defcustom org-latex-engraved-theme nil
   "The theme that should be used for engraved code, when non-nil.
-This can be set to any theme defined in `engrave-faces-themes' or
-loadable by Emacs.  When set to t, the current Emacs theme is
-used.  When nil, no theme is applied."
+This can be set to any theme defined in `engrave-faces-themes'
+(from the engrave-faces package) or loadable by Emacs.  When set
+to t, the current Emacs theme is used.  When nil, no theme is
+applied."
   :group 'org-export-latex
   :package-version '(Org . "9.6")
   :type 'symbol)
@@ -3666,7 +3667,7 @@ CONTENTS is the contents of the object."
 ;; takes care of tables with a "verbatim" mode.  Otherwise, it
 ;; delegates the job to either `org-latex--table.el-table',
 ;; `org-latex--org-table', `org-latex--math-table' or
-;; `org-latex--org-tabbing' functions,
+;; `org-latex--org-align-string-tabbing' functions,
 ;; depending of the type of the table and the mode requested.
 ;;
 ;; `org-latex--align-string' is a subroutine used to build alignment