diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-04-30 09:41:13 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-04-30 09:41:13 -0400 |
| commit | 2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a (patch) | |
| tree | 03003dd08807987b2040a741e1e9aab44ca367dd /lisp/org | |
| parent | ca43435816b7c7ceaef1a6fce967cbdbcf243ea3 (diff) | |
| download | emacs-2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a.tar.gz emacs-2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a.tar.bz2 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/org')
| -rw-r--r-- | lisp/org/org-macs.el | 11 |
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 @@ ;;; 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 |