emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/org 2d38026581: Do not assert Org version in root Org l


From: ELPA Syncer
Subject: [elpa] externals/org 2d38026581: Do not assert Org version in root Org libraries
Date: Thu, 15 Sep 2022 00:57:59 -0400 (EDT)

branch: externals/org
commit 2d3802658156153974f540877a82bf5a384a2ad4
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    Do not assert Org version in root Org libraries
    
    * lisp/org-compat.el:
    * lisp/org-macs.el: Do not check Org version.  These two libraries are
    the base libraries required to generate the Org version.  The version
    is not yet known when loading them; or, worse, built-in
    `org-git-version' may be defined from built-in Org distribution.
    
    Fixes 
https://orgmode.org/list/cdf0bc7d-3ed1-e1ce-84bb-239575a9c0b9@oracle.com
---
 lisp/org-compat.el | 4 +++-
 lisp/org-macs.el   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 60a66f24a6..366edcb3ca 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -34,7 +34,9 @@
 (require 'seq)
 (require 'org-macs)
 
-(org-assert-version)
+;; We rely on org-compat when generating Org version.  Checking Org
+;; version here will interfere with Org build process.
+;; (org-assert-version)
 
 (declare-function org-agenda-diary-entry "org-agenda")
 (declare-function org-agenda-maybe-redo "org-agenda" ())
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index b2eb809509..e7e6b0e009 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -73,7 +73,9 @@ Version mismatch is commonly encountered in the following 
situations:
    deferring the loading.")
      (error "Org version mismatch.  Make sure that correct `load-path' is set 
early in init.el")))
 
-(org-assert-version)
+;; We rely on org-macs when generating Org version.  Checking Org
+;; version here will interfere with Org build process.
+;; (org-assert-version)
 
 (declare-function org-mode "org" ())
 (declare-function org-agenda-files "org" (&optional unrestricted archives))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]