From 89140b0d747aa127e7b06ed927c09286215e4824 Mon Sep 17 00:00:00 2001 Message-Id: <89140b0d747aa127e7b06ed927c09286215e4824.1681395507.git.yantar92@posteo.net> From: Ihor Radchenko Date: Thu, 13 Apr 2023 16:18:15 +0200 Subject: [PATCH] org-assert-version: Skip version check when Org is a part of Emacs * lisp/org-macs.el (org--built-in-p): New constant indicating if Org source is a part of Emacs source tree. (org-assert-version): Skip check when Org is built-in. --- lisp/org-macs.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index ad1d3cf14..b4a5d82c8 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -36,6 +36,9 @@ (require 'format-spec) ;;; Org version verification. +(defconst org--built-in-p nil + "When non-nil, assume that Org is a part of Emacs source. +See Emacs bug #62762.") (defmacro org-assert-version () "Assert compile time and runtime version match." ;; We intentionally use a more permissive `org-release' instead of @@ -45,7 +48,7 @@ (defmacro org-assert-version () ;; `org-assert-version' calls would fail using strict ;; `org-git-version' check because the generated Org version strings ;; will not match. - `(unless (equal (org-release) ,(org-release)) + `(unless (or org--built-in-p (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.40.0