ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'km/from-emacs-29' into bugfix

This commit is contained in:
Kyle Meyer 2024-01-20 21:27:59 -05:00
parent 25c786f0fb 50183ada86
commit de060c36d4
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-element.el
View File

@ -6556,7 +6556,7 @@ the expected result."
(error "org-element: Parsing aborted by user. Cache has been cleared. (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).")) If you observe Emacs hangs frequently, please report this to Org mode mailing list (M-x org-submit-bug-report)."))
(message (substitute-command-keys (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-max-count
org-element--cache-interrupt-C-g-count))) org-element--cache-interrupt-C-g-count)))
(unless element (unless element

2
lisp/org-fold-core.el
View File

@ -433,7 +433,7 @@ Return nil when there is no matching folding spec."
(org-fold-core-get-folding-spec-from-alias spec-or-alias)) (org-fold-core-get-folding-spec-from-alias spec-or-alias))
(defsubst org-fold-core--check-spec (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) (unless (org-fold-core-folding-spec-p spec-or-alias)
(error "%s is not a valid folding spec" spec-or-alias))) (error "%s is not a valid folding spec" spec-or-alias)))

2
lisp/org-macs.el
View File

@ -1072,7 +1072,7 @@ Return width in pixels when PIXELS is non-nil."
;; FIXME: Fallback to old limited version, because ;; FIXME: Fallback to old limited version, because
;; `window-pixel-width' is buggy in older Emacs. ;; `window-pixel-width' is buggy in older Emacs.
(org--string-width-1 string) (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. ;; large value including the prefix.
(remove-text-properties 0 (length string) (remove-text-properties 0 (length string)
'(wrap-prefix t line-prefix t) '(wrap-prefix t line-prefix t)

11
lisp/ox-latex.el
View File

@ -978,7 +978,7 @@ The most comprehensive option can be set with,
which causes source code to be run through which causes source code to be run through
`engrave-faces-latex-buffer', which generates colorings using `engrave-faces-latex-buffer', which generates colorings using
Emacs' font-lock information. This requires the Emacs package 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. fvextra be installed.
The styling of the engraved result can be customized with 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 (defcustom org-latex-engraved-theme nil
"The theme that should be used for engraved code, when non-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 This can be set to any theme defined in `engrave-faces-themes'
loadable by Emacs. When set to t, the current Emacs theme is (from the engrave-faces package) or loadable by Emacs. When set
used. When nil, no theme is applied." to t, the current Emacs theme is used. When nil, no theme is
applied."
:group 'org-export-latex :group 'org-export-latex
:package-version '(Org . "9.6") :package-version '(Org . "9.6")
:type 'symbol) :type 'symbol)
@ -3666,7 +3667,7 @@ CONTENTS is the contents of the object."
;; takes care of tables with a "verbatim" mode. Otherwise, it ;; takes care of tables with a "verbatim" mode. Otherwise, it
;; delegates the job to either `org-latex--table.el-table', ;; delegates the job to either `org-latex--table.el-table',
;; `org-latex--org-table', `org-latex--math-table' or ;; `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. ;; depending of the type of the table and the mode requested.
;; ;;
;; `org-latex--align-string' is a subroutine used to build alignment ;; `org-latex--align-string' is a subroutine used to build alignment