branch: externals/org
commit 1ca4804a801c5910d055550a9afefa33ac8e35ed
Merge: 90e8d8b045 e2ef506035
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/ob-latex.el | 2 +-
lisp/org-macs.el | 13 +++++++++++--
lisp/ox-latex.el | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 7fcb76cd09..fc325f2594 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -133,7 +133,7 @@ exporting the literal LaTeX source."
"you need to install the programs: latex and dvipng."
:image-input-type "dvi" :image-output-type "png"
:image-size-adjust (1.0 . 1.0) :latex-compiler
- ,(if (executable-find "latexmk")
+ ,(if (and (executable-find "latexmk") (executable-find "perl"))
'("latexmk -f -pdf -latex -interaction=nonstopmode
-output-directory=%o %f")
'("latex -interaction nonstopmode -output-directory %o %f"
"latex -interaction nonstopmode -output-directory %o %f"
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 9c7174efe4..d769fffa04 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -82,7 +82,16 @@ Version mismatch is commonly encountered in the following
situations:
It is recommended to set `load-path' as early in the config as
possible.
-3. New Org version is loaded using straight.el package manager and
+3. New Org version is loaded while an old Org version is partially
+ loaded during compilation or M-x package-upgrade. This usually
+ should not happen (at least, a number of attemps have been made
+ to avoid this problem in package.el), but sometimes it does anyway.
+
+ You can manually delete Org installation from ~/.emacs.d/elpa/ and
+ try installing again, possibly from emacs -Q without any
+ configuration loaded.
+
+4. New Org version is loaded using straight.el package manager and
other package depending on Org is loaded before straight triggers
loading of the newer Org version.
@@ -95,7 +104,7 @@ Version mismatch is commonly encountered in the following
situations:
sufficient if the corresponding `use-package' statement is
deferring the loading.
-4. A new Org version is synchronized with Emacs git repository and
+5. A new Org version is synchronized with Emacs git repository and
stale .elc files are still left from the previous build.
It is recommended to remove .elc files from lisp/org directory and
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 5b9704b884..4607be2d51 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1462,7 +1462,7 @@ A better approach is to use a compiler suit such as
`latexmk'."
:package-version '(Org . "9.0"))
(defcustom org-latex-pdf-process
- (if (executable-find "latexmk")
+ (if (and (executable-find "latexmk") (executable-find "perl"))
'("latexmk -f -pdf -%latex -interaction=nonstopmode -output-directory=%o
%f")
'("%latex -interaction nonstopmode -output-directory %o %f"
"%latex -interaction nonstopmode -output-directory %o %f"
