[elpa] externals/org e065b53a4a: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit e065b53a4aaba0f5a358194ad7fd14b2f10fb373
Merge: 56f651e961 8eb209984e
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/org-macs.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 93906ec798..91c7166613 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -36,7 +36,7 @@
 
 ;;; Org version verification.
 
-(defconst org--built-in-p nil
+(defvar org--inhibit-version-check nil
   "When non-nil, assume that Org is a part of Emacs source.
 For internal use only.  See Emacs bug #62762.
 This variable is only supposed to be changed by Emacs build scripts.")
@@ -49,7 +49,7 @@ This variable is only supposed to be changed by Emacs build 
scripts.")
   ;; `org-assert-version' calls would fail using strict
   ;; `org-git-version' check because the generated Org version strings
   ;; will not match.
-  `(unless (or org--built-in-p (equal (org-release) ,(org-release)))
+  `(unless (or org--inhibit-version-check (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.