branch: externals/org
commit 6001313b8f8bc2c717b44070d6e7b19afc6125ec
Merge: 3e23682d37 65ca7bc6a7
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/org-macs.el | 2 +-
lisp/ox.el | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index cda9c5e034..8761404512 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -46,7 +46,7 @@
;; `org-git-version' check because the generated Org version strings
;; will not match.
`(unless (equal (org-release) ,(org-release))
- (warn "Org version mismatch. Make sure that correct `load-path' is set
early in init.el
+ (warn "Org version mismatch. Org loading aborted.
This warning usually appears when a built-in Org version is loaded
prior to the more recent Org version.
diff --git a/lisp/ox.el b/lisp/ox.el
index fd6428c32c..0444371144 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6683,14 +6683,14 @@ see.
Optional argument POST-PROCESS is a function which should accept
no argument. It is always called within the current process,
from BUFFER, with point at its beginning. Export back-ends can
-use it to set a major mode there, e.g,
+use it to set a major mode there, e.g.,
(defun org-latex-export-as-latex
(&optional async subtreep visible-only body-only ext-plist)
(interactive)
(org-export-to-buffer \\='latex \"*Org LATEX Export*\"
async subtreep visible-only body-only ext-plist
- #'LaTeX-mode))
+ #\\='LaTeX-mode))
When expressed as an anonymous function, using `lambda',
POST-PROCESS needs to be quoted.
