From 8eb209984e3f205d09b2d72d9fb45ffb1d7bc2bf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 24 Apr 2023 14:24:27 +0200 Subject: [PATCH] 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 --- lisp/org-macs.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index aef05bc6e..b8e026553 100644 --- a/lisp/org-macs.el +++ b/lisp/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.