aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2023-04-30 09:41:13 -0400
committerStefan Monnier2023-04-30 09:41:13 -0400
commit2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a (patch)
tree03003dd08807987b2040a741e1e9aab44ca367dd /lisp
parentca43435816b7c7ceaef1a6fce967cbdbcf243ea3 (diff)
downloademacs-2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a.tar.gz
emacs-2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a.zip
* lisp/org/org-macs.el (org--inhibit-version-check): Fix docstring
Also, add an explanation to the docstring for what the version check is about.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/org/org-macs.el11
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index b8e026553b3..1552675f8a8 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -37,9 +37,16 @@
37;;; Org version verification. 37;;; Org version verification.
38 38
39(defvar org--inhibit-version-check nil 39(defvar org--inhibit-version-check nil
40 "When non-nil, assume that Org is a part of Emacs source. 40 "When non-nil, skip the detection of mixed-versions situations.
41For internal use only. See Emacs bug #62762. 41For internal use only. See Emacs bug #62762.
42This variable is only supposed to be changed by Emacs build scripts.") 42This variable is only supposed to be changed by Emacs build scripts.
43When nil, Org tries to detect when Org source files were compiled with
44a different version of Org (which tends to lead to incorrect `.elc' files),
45or when the current Emacs session has loaded a mix of files from different
46Org versions (typically the one bundled with Emacs and another one installed
47from GNU ELPA), which can happen if some parts of Org were loaded before
48`load-path' was changed (e.g. before the GNU-ELPA-installed Org is activated
49by `package-activate-all').")
43(defmacro org-assert-version () 50(defmacro org-assert-version ()
44 "Assert compile time and runtime version match." 51 "Assert compile time and runtime version match."
45 ;; We intentionally use a more permissive `org-release' instead of 52 ;; We intentionally use a more permissive `org-release' instead of