branch: externals/org
commit cbea9fa70ffc2cf7b03ecbd0dd8a74b49c96e78b
Merge: 6310bcd5ed 13fdbf73ff
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix'
---
mk/org-fixup.el | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index e595eac7b4..efb9fb2993 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -30,14 +30,18 @@
"Generate the Texinfo file out of the Org manual."
(require 'ox-texinfo)
(find-file "../doc/org-manual.org")
- (let ((org-confirm-babel-evaluate nil))
+ (let ((org-confirm-babel-evaluate nil)
+ ;; We do not want to search local user files when building manuals.
+ (org-id-track-globally nil))
(org-texinfo-export-to-texinfo)))
(defun org-make-guide ()
"Generate the Texinfo file out of the Org guide."
(require 'ox-texinfo)
(find-file "../doc/org-guide.org")
- (let ((org-confirm-babel-evaluate nil))
+ (let ((org-confirm-babel-evaluate nil)
+ ;; We do not want to search local user files when building manuals.
+ (org-id-track-globally nil))
(org-texinfo-export-to-texinfo)))
(make-obsolete 'org-make-manuals
@@ -48,7 +52,9 @@
(require 'ox-texinfo)
(dolist (manual '("../doc/org-manual.org" "../doc/org-guide.org"))
(find-file manual)
- (let ((org-confirm-babel-evaluate nil))
+ (let ((org-confirm-babel-evaluate nil)
+ ;; We do not want to search local user files when building manuals.
+ (org-id-track-globally nil))
(org-texinfo-export-to-texinfo))))
(defun org-make-org-version (org-release org-git-version)
