[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#62762: 'make' often errors with "Org version mismatch" after pulling
From: |
Ihor Radchenko |
Subject: |
bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code |
Date: |
Thu, 13 Apr 2023 14:20:05 +0000 |
Eli Zaretskii <eliz@gnu.org> writes:
> I think ELisp variable is better, since environment variables are
> inherited by sub-processes in ways that are hard to control.
See the attached.
On Emacs side, `org--built-in-p' will need to be set during compilation.
>From 89140b0d747aa127e7b06ed927c09286215e4824 Mon Sep 17 00:00:00 2001
Message-Id:
<89140b0d747aa127e7b06ed927c09286215e4824.1681395507.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
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
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, (continued)
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/11
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/11
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/11
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/11
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/11
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/11
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/12
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/12
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/13
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/13
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code,
Ihor Radchenko <=
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/13
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/13
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/15
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/15
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/15
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/15
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/15
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/21
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Ihor Radchenko, 2023/04/21
- bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code, Eli Zaretskii, 2023/04/22