From 1bcab6c04f53c2efd3c0724a64d7175c42f99d47 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Tue, 24 Jan 2023 23:08:43 +0300 Subject: [PATCH 1/2] org-assert-version: Clarify that Org loading is aborted * lisp/org-macs.el (org-assert-version): Explicitly state that Org loading is aborted. Some users otherwise assume that the warning can be ignored. Also, remove sentence about `load-path' as it is explained later in the warning text. --- lisp/org-macs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 07c668a80..8d7b0b034 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. From 65ca7bc6a7e847c9c8e34c7a7138a86b438d0438 Mon Sep 17 00:00:00 2001 From: Arash Esbati Date: Wed, 25 Jan 2023 16:34:42 +0100 Subject: [PATCH 2/2] lisp/ox.el: Pacify compiler warning * lisp/ox.el (org-export-to-buffer): Escape single quote in the example given in docstring. Add missing '.' after the abbreviation. --- lisp/ox.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index 65f9ff182..6f819def9 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -6600,14 +6600,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.