[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 73f25bba8f 3/3: * lisp/org-macs.el (org-assert-vers
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 73f25bba8f 3/3: * lisp/org-macs.el (org-assert-version): Use more lax assertion |
Date: |
Mon, 26 Sep 2022 07:57:53 -0400 (EDT) |
branch: externals/org
commit 73f25bba8ffb9fe434486832c6acb98794dd2e69
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>
* lisp/org-macs.el (org-assert-version): Use more lax assertion
See https://orgmode.org/list/jwvczc05u7r.fsf-monnier+emacs@gnu.org
---
lisp/org-macs.el | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 987afe5ed6..e3fa361319 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -38,7 +38,14 @@
(defmacro org-assert-version ()
"Assert compile time and runtime version match."
- `(unless (equal (org-git-version) ,(org-git-version))
+ ;; We intentionally use a more permissive `org-release' instead of
+ ;; `org-git-version' to work around deficiencies in Elisp
+ ;; compilation after pulling latest changes. Unchanged files will
+ ;; not be re-compiled and thus their macro-expanded
+ ;; `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))
(warn "Org version mismatch. Make sure that correct `load-path' is set
early in init.el
This warning usually appears when a built-in Org version is loaded
prior to the more recent Org version.