From 2993f482c1bd08a051eb587cbfb2288368c4a165 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 30 Apr 2023 09:41:13 -0400 Subject: [PATCH] Backport commit 2bcf11d0e from Emacs * lisp/org-macs.el (org--inhibit-version-check): Fix docstring. 2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a Stefan Monnier Sun Apr 30 09:41:13 2023 -0400 --- lisp/org-macs.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index b8e026553..1552675f8 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -37,9 +37,16 @@ ;;; Org version verification. (defvar org--inhibit-version-check nil - "When non-nil, assume that Org is a part of Emacs source. + "When non-nil, skip the detection of mixed-versions situations. For internal use only. See Emacs bug #62762. -This variable is only supposed to be changed by Emacs build scripts.") +This variable is only supposed to be changed by Emacs build scripts. +When nil, Org tries to detect when Org source files were compiled with +a different version of Org (which tends to lead to incorrect `.elc' files), +or when the current Emacs session has loaded a mix of files from different +Org versions (typically the one bundled with Emacs and another one installed +from GNU ELPA), which can happen if some parts of Org were loaded before +`load-path' was changed (e.g. before the GNU-ELPA-installed Org is activated +by `package-activate-all').") (defmacro org-assert-version () "Assert compile time and runtime version match." ;; We intentionally use a more permissive `org-release' instead of