procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build when Org's version changes

Browse source 
* 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)
This commit is contained in:
Eli Zaretskii 2023-04-24 14:16:05 +03:00
parent 65735cee71
commit 62e4eb8fcf
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/Makefile.in
View file

@ -72,9 +72,10 @@ AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \
${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el
# Set load-prefer-newer for the benefit of the non-bootstrappers.
# Set org--inhibit-version-check to avoid unnecessarily aborting the build.
BYTE_COMPILE_FLAGS = \
--eval "(setq load-prefer-newer t byte-compile-warnings 'all)" \
--eval "(setq org--built-in-p t)" $(BYTE_COMPILE_EXTRA_FLAGS)
--eval "(setq org--inhibit-version-check t)" $(BYTE_COMPILE_EXTRA_FLAGS)
# ... but we must prefer .elc files for those in the early bootstrap.
compile-first: BYTE_COMPILE_FLAGS = $(BYTE_COMPILE_EXTRA_FLAGS)

4
lisp/org/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.