ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport commit 62e4eb8fcf7 from Emacs 

Fix build when Org's version changes

* lisp/org/org-macs.el (org--inhibit-version-check): Rename from
'org--built-in-p' and make it a defvar.  All users changed.
(Bug#62762)

62e4eb8fcf71a852117b372809bd4a7953f9b679
Eli Zaretskii
Mon Apr 24 14:16:05 2023 +0300
This commit is contained in:
Eli Zaretskii 2023-04-24 14:24:27 +02:00 committed by Ihor Radchenko
parent 92f9135b3c
commit 8eb209984e
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-macs.el
View File

@ -36,7 +36,7 @@
;;; Org version verification.
(defconst org--built-in-p nil
(defvar org--inhibit-version-check nil
"When non-nil, assume that Org is a part of Emacs source.
For internal use only. See Emacs bug #62762.
This variable is only supposed to be changed by Emacs build scripts.")
@ -49,7 +49,7 @@ This variable is only supposed to be changed by Emacs build scripts.")
;; `org-assert-version' calls would fail using strict
;; `org-git-version' check because the generated Org version strings
;; will not match.
`(unless (or org--built-in-p (equal (org-release) ,(org-release)))
`(unless (or org--inhibit-version-check (equal (org-release) ,(org-release)))
(warn "Org version mismatch. Org loading aborted.
This warning usually appears when a built-in Org version is loaded
prior to the more recent Org version.