Browse Source

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
Ihor Radchenko 2 years ago
parent
commit
2d38026581
2 changed files with 6 additions and 2 deletions
  1. 3 1
      lisp/org-compat.el
  2. 3 1
      lisp/org-macs.el

+ 3 - 1
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" ())

+ 3 - 1
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))