From 62e4eb8fcf71a852117b372809bd4a7953f9b679 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 24 Apr 2023 14:16:05 +0300 Subject: [PATCH] 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) --- lisp/Makefile.in | 3 ++- lisp/org/org-macs.el | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 4aa01e77e4e..c90237615c6 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -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) diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el index aef05bc6ee6..b8e026553b3 100644 --- a/lisp/org/org-macs.el +++ b/lisp/org/org-macs.el @@ -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. -- 2.39.2