From: Ihor Radchenko <yantar92@posteo.net>
To: Bastien <bzg@gnu.org>
Cc: Kyle Meyer <kyle@kyleam.com>, emacs-orgmode@gnu.org
Subject: Re: [PATCH] Autoload `org-assert-version' and remove org-loaddefs.el
Date: Wed, 29 Mar 2023 13:38:26 +0000 [thread overview]
Message-ID: <87o7obn0dp.fsf@localhost> (raw)
In-Reply-To: <87r0xi5jx7.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 867 bytes --]
Bastien <bzg@gnu.org> writes:
> That said, do you have any idea how to fix the bug people encounter
> when installing Org from ELPA and being bitten by "invalid-function
> org-assert-version"?
Even though we identified that the problem is related to a combination
of old Emacs version and OS-specific Emacs customization
(https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59882), no further
progress is there on fixing the issue.
Considering the mixed installation problem was less frequent compared to
this new one, I suggest the attached workaround - simply not calling
`org-assert-version' in Emacs <29, where built-in Org does not provide
this macro. It should at least resolve the immediate pain for many
people at the cost of possible mixed installation problems.
Unless there are immediate concerns about the patch, I am going to
install it soon onto bugfix.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Work-around-org-assert-version-bug-on-older-Emacs.patch --]
[-- Type: text/x-patch, Size: 44440 bytes --]
From a4b25e0fc0844c48fd89cb76cc242fca08a66c02 Mon Sep 17 00:00:00 2001
Message-Id: <a4b25e0fc0844c48fd89cb76cc242fca08a66c02.1680096852.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Wed, 29 Mar 2023 15:27:50 +0200
Subject: [PATCH] Work around `org-assert-version' bug on older Emacs
Do not use `org-assert-version' for Emacs builds where Org does not
define this macro inside built-in Org.
See Emacs bug#59882, where the problem is triggered by some unclear
combination of OS-specific (at least Debian, Ubuntu, and Fedora) Emacs
tweaks and built-in Org not definition `org-assert-version'.
This is not a proper fix of the mixed installation problem that
`org-assert-version' attempts to solve, but still better as
`org-assert-version' triggers problems more consistently than mixed
installation.
---
lisp/ob-C.el | 3 ++-
lisp/ob-R.el | 3 ++-
lisp/ob-calc.el | 3 ++-
lisp/ob-clojure.el | 3 ++-
lisp/ob-comint.el | 3 ++-
lisp/ob-core.el | 3 ++-
lisp/ob-css.el | 3 ++-
lisp/ob-ditaa.el | 3 ++-
lisp/ob-dot.el | 3 ++-
lisp/ob-emacs-lisp.el | 3 ++-
lisp/ob-eshell.el | 3 ++-
lisp/ob-eval.el | 3 ++-
lisp/ob-exp.el | 3 ++-
lisp/ob-forth.el | 3 ++-
lisp/ob-fortran.el | 3 ++-
lisp/ob-gnuplot.el | 3 ++-
lisp/ob-groovy.el | 3 ++-
lisp/ob-haskell.el | 3 ++-
lisp/ob-java.el | 3 ++-
lisp/ob-js.el | 3 ++-
lisp/ob-julia.el | 3 ++-
lisp/ob-latex.el | 3 ++-
lisp/ob-lilypond.el | 3 ++-
lisp/ob-lisp.el | 3 ++-
lisp/ob-lob.el | 3 ++-
lisp/ob-lua.el | 3 ++-
lisp/ob-makefile.el | 3 ++-
lisp/ob-matlab.el | 3 ++-
lisp/ob-maxima.el | 3 ++-
lisp/ob-ocaml.el | 3 ++-
lisp/ob-octave.el | 3 ++-
lisp/ob-org.el | 3 ++-
lisp/ob-perl.el | 3 ++-
lisp/ob-plantuml.el | 3 ++-
lisp/ob-processing.el | 3 ++-
lisp/ob-python.el | 3 ++-
lisp/ob-ref.el | 3 ++-
lisp/ob-ruby.el | 3 ++-
lisp/ob-sass.el | 3 ++-
lisp/ob-scheme.el | 3 ++-
lisp/ob-screen.el | 3 ++-
lisp/ob-sed.el | 3 ++-
lisp/ob-shell.el | 3 ++-
lisp/ob-sql.el | 3 ++-
lisp/ob-sqlite.el | 3 ++-
lisp/ob-table.el | 3 ++-
lisp/ob-tangle.el | 3 ++-
lisp/ob.el | 3 ++-
lisp/oc-basic.el | 3 ++-
lisp/oc-biblatex.el | 3 ++-
lisp/oc-bibtex.el | 3 ++-
lisp/oc-csl.el | 3 ++-
lisp/oc-natbib.el | 3 ++-
lisp/oc.el | 3 ++-
lisp/ol-bbdb.el | 3 ++-
lisp/ol-bibtex.el | 3 ++-
lisp/ol-docview.el | 3 ++-
lisp/ol-doi.el | 3 ++-
lisp/ol-eshell.el | 3 ++-
lisp/ol-eww.el | 3 ++-
lisp/ol-gnus.el | 3 ++-
lisp/ol-info.el | 3 ++-
lisp/ol-irc.el | 3 ++-
lisp/ol-man.el | 3 ++-
lisp/ol-mhe.el | 3 ++-
lisp/ol-rmail.el | 3 ++-
lisp/ol-w3m.el | 3 ++-
lisp/ol.el | 3 ++-
lisp/org-agenda.el | 3 ++-
lisp/org-archive.el | 3 ++-
lisp/org-attach-git.el | 3 ++-
lisp/org-attach.el | 3 ++-
lisp/org-capture.el | 3 ++-
lisp/org-clock.el | 3 ++-
lisp/org-colview.el | 3 ++-
lisp/org-crypt.el | 3 ++-
lisp/org-ctags.el | 3 ++-
lisp/org-cycle.el | 3 ++-
lisp/org-datetree.el | 3 ++-
lisp/org-duration.el | 3 ++-
lisp/org-element.el | 3 ++-
lisp/org-entities.el | 3 ++-
lisp/org-faces.el | 3 ++-
lisp/org-feed.el | 3 ++-
lisp/org-fold-core.el | 3 ++-
lisp/org-fold.el | 3 ++-
| 3 ++-
lisp/org-goto.el | 3 ++-
lisp/org-habit.el | 3 ++-
lisp/org-id.el | 3 ++-
lisp/org-indent.el | 3 ++-
lisp/org-inlinetask.el | 3 ++-
lisp/org-keys.el | 3 ++-
lisp/org-lint.el | 3 ++-
lisp/org-list.el | 3 ++-
lisp/org-macro.el | 3 ++-
lisp/org-mobile.el | 3 ++-
lisp/org-mouse.el | 3 ++-
lisp/org-num.el | 3 ++-
lisp/org-pcomplete.el | 3 ++-
lisp/org-persist.el | 3 ++-
lisp/org-plot.el | 3 ++-
lisp/org-protocol.el | 3 ++-
lisp/org-refile.el | 3 ++-
lisp/org-src.el | 3 ++-
lisp/org-table.el | 3 ++-
lisp/org-tempo.el | 3 ++-
lisp/org-timer.el | 3 ++-
lisp/org.el | 3 ++-
lisp/ox-ascii.el | 3 ++-
lisp/ox-beamer.el | 3 ++-
lisp/ox-html.el | 3 ++-
lisp/ox-icalendar.el | 3 ++-
lisp/ox-koma-letter.el | 3 ++-
lisp/ox-latex.el | 3 ++-
lisp/ox-man.el | 3 ++-
lisp/ox-md.el | 3 ++-
lisp/ox-odt.el | 3 ++-
lisp/ox-org.el | 3 ++-
lisp/ox-publish.el | 3 ++-
lisp/ox-texinfo.el | 3 ++-
lisp/ox.el | 3 ++-
122 files changed, 244 insertions(+), 122 deletions(-)
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 3a6e99623..8ca9d68d3 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -34,7 +34,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cc-mode)
(require 'ob)
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 4ee091118..e7715c3da 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -30,7 +30,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ob)
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 5572ce818..14e6f6e78 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index d993e0cb7..3082e2c55 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -47,7 +47,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 54bf5127e..10034d467 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -32,7 +32,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob-core)
(require 'org-compat)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 3f6696fce..7b41d8d5c 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -25,7 +25,8 @@ ;;; ob-core.el --- Working with Code Blocks -*- lexical-binding: t; -*-
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ob-eval)
diff --git a/lisp/ob-css.el b/lisp/ob-css.el
index f93c576fc..a4f5b4579 100644
--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 622000828..f054def8f 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -38,7 +38,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-compat)
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index ecef071a7..47acf6b4a 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -41,7 +41,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index f2111d649..ecbf4929e 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -28,7 +28,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob-core)
diff --git a/lisp/ob-eshell.el b/lisp/ob-eshell.el
index 95f5777ae..447d1f942 100644
--- a/lisp/ob-eshell.el
+++ b/lisp/ob-eshell.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'eshell)
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index 07e530772..e8da607f9 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(eval-when-compile (require 'subr-x)) ; For `string-empty-p', Emacs < 29
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 4d1b084be..335ba1972 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -25,7 +25,8 @@ ;;; ob-exp.el --- Exportation of Babel Source Blocks -*- lexical-binding: t; -*-
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob-core)
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index e5dcad6d0..e63fbc0ed 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -34,7 +34,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index 2c050cb18..ed949ba23 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index e3e42918c..f13358926 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -41,7 +41,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el
index c0da69fcb..df785ae0a 100644
--- a/lisp/ob-groovy.el
+++ b/lisp/ob-groovy.el
@@ -33,7 +33,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index 7185ed61f..bf931f1d4 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -41,7 +41,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-java.el b/lisp/ob-java.el
index 893860526..5c66dbf15 100644
--- a/lisp/ob-java.el
+++ b/lisp/ob-java.el
@@ -30,7 +30,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 910c11686..aaadd1ecf 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -40,7 +40,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index cb5c7fa3b..06fe2a65d 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -33,7 +33,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ob)
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index ce39628d6..2cee7bfea 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -32,7 +32,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index 9693b89e2..1caba15ec 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -34,7 +34,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 048ef883c..4f0b56826 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -38,7 +38,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index f77bda73d..2bcee3947 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -25,7 +25,8 @@ ;;; ob-lob.el --- Functions Supporting the Library of Babel -*- lexical-binding:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ob-core)
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index 81521d9e0..14c000e13 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -37,7 +37,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-makefile.el b/lisp/ob-makefile.el
index 25306159b..f4a01eb34 100644
--- a/lisp/ob-makefile.el
+++ b/lisp/ob-makefile.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el
index 43344495d..4ad76ab8f 100644
--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@@ -37,7 +37,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'ob-octave)
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index d1d7c7424..0815e92e5 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -33,7 +33,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 09224b98b..d15afaa80 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -37,7 +37,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'comint)
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index 1de263a52..3144a9780 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -31,7 +31,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 1bf02b461..62d53107a 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index c8cff5da5..4f1d72792 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -30,7 +30,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index 3202c6e41..30760b2fd 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -36,7 +36,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index 4eeaf98e0..243784a26 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -53,7 +53,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'sha1)
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index c19af0ab3..142025fbe 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -30,7 +30,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 2eae3690d..0cd7e71df 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -51,7 +51,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob-core)
(require 'org-macs)
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index b94bc73dd..c43b80c1e 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -37,7 +37,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index 1498b931e..e2366c60b 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -40,7 +40,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index ef41a2ec4..6a7577e86 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -40,7 +40,8 @@ ;;; Requirements:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'geiser nil t)
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index 269538e79..0b75ccff1 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -36,7 +36,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-sed.el b/lisp/ob-sed.el
index 6469901fd..92089717f 100644
--- a/lisp/ob-sed.el
+++ b/lisp/ob-sed.el
@@ -42,7 +42,8 @@ ;;; Usage:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 2c30a2605..6875bf051 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -28,7 +28,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'org-macs)
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index f73e7003f..551273926 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -72,7 +72,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index 526b73ebd..41a22fcf5 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob)
(require 'ob-sql)
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 5c91f33f8..168517884 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -55,7 +55,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ob-core)
(require 'org-macs)
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 27443fc2e..a1046c799 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -28,7 +28,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-src)
diff --git a/lisp/ob.el b/lisp/ob.el
index 4444ced58..23e651846 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -24,7 +24,8 @@ ;;; ob.el --- Working with Code Blocks in Org -*- lexical-binding: t; -*-
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'org-compat)
diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index 1c8c37aa9..62e93ebb8 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -67,7 +67,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'bibtex)
(require 'json)
diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index b2d31f0f6..1fe816a5d 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -64,7 +64,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'map)
(require 'org-macs)
diff --git a/lisp/oc-bibtex.el b/lisp/oc-bibtex.el
index d5e5490ed..0bc9669c0 100644
--- a/lisp/oc-bibtex.el
+++ b/lisp/oc-bibtex.el
@@ -37,7 +37,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'oc)
diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el
index 2b00cb599..85d5a15b5 100644
--- a/lisp/oc-csl.el
+++ b/lisp/oc-csl.el
@@ -113,7 +113,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'map)
diff --git a/lisp/oc-natbib.el b/lisp/oc-natbib.el
index 855be2a5c..791f29432 100644
--- a/lisp/oc-natbib.el
+++ b/lisp/oc-natbib.el
@@ -44,7 +44,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'oc)
diff --git a/lisp/oc.el b/lisp/oc.el
index 260a4d3e1..8919f6abd 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -62,7 +62,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-compat)
(require 'org-macs)
diff --git a/lisp/ol-bbdb.el b/lisp/ol-bbdb.el
index 47bd9d98c..10d3285f6 100644
--- a/lisp/ol-bbdb.el
+++ b/lisp/ol-bbdb.el
@@ -94,7 +94,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-compat)
diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el
index fd9517233..28fcba264 100644
--- a/lisp/ol-bibtex.el
+++ b/lisp/ol-bibtex.el
@@ -108,7 +108,8 @@ ;;; History:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'bibtex)
(require 'cl-lib)
diff --git a/lisp/ol-docview.el b/lisp/ol-docview.el
index a9cd9b995..6428dfc05 100644
--- a/lisp/ol-docview.el
+++ b/lisp/ol-docview.el
@@ -43,7 +43,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'doc-view)
(require 'ol)
diff --git a/lisp/ol-doi.el b/lisp/ol-doi.el
index 971b05087..676fd3388 100644
--- a/lisp/ol-doi.el
+++ b/lisp/ol-doi.el
@@ -27,7 +27,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ol)
diff --git a/lisp/ol-eshell.el b/lisp/ol-eshell.el
index b7d3baf38..97db1dbc0 100644
--- a/lisp/ol-eshell.el
+++ b/lisp/ol-eshell.el
@@ -24,7 +24,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'eshell)
(require 'esh-mode)
diff --git a/lisp/ol-eww.el b/lisp/ol-eww.el
index ee970b6aa..cb52c2e24 100644
--- a/lisp/ol-eww.el
+++ b/lisp/ol-eww.el
@@ -46,7 +46,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ol)
(require 'cl-lib)
diff --git a/lisp/ol-gnus.el b/lisp/ol-gnus.el
index 7c07ce045..42e1bc9e6 100644
--- a/lisp/ol-gnus.el
+++ b/lisp/ol-gnus.el
@@ -32,7 +32,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'gnus-sum)
(require 'gnus-util)
diff --git a/lisp/ol-info.el b/lisp/ol-info.el
index ad9e4a12b..95e032479 100644
--- a/lisp/ol-info.el
+++ b/lisp/ol-info.el
@@ -31,7 +31,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ol)
diff --git a/lisp/ol-irc.el b/lisp/ol-irc.el
index 3760644e8..38de927b5 100644
--- a/lisp/ol-irc.el
+++ b/lisp/ol-irc.el
@@ -49,7 +49,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ol)
diff --git a/lisp/ol-man.el b/lisp/ol-man.el
index 40fdc8f92..fcf858331 100644
--- a/lisp/ol-man.el
+++ b/lisp/ol-man.el
@@ -25,7 +25,8 @@ ;;; ol-man.el --- Links to man pages -*- lexical-binding: t; -*-
;;; Commentary:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ol)
diff --git a/lisp/ol-mhe.el b/lisp/ol-mhe.el
index 403b5a254..0782afc29 100644
--- a/lisp/ol-mhe.el
+++ b/lisp/ol-mhe.el
@@ -31,7 +31,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'ol)
diff --git a/lisp/ol-rmail.el b/lisp/ol-rmail.el
index 287779828..a27797666 100644
--- a/lisp/ol-rmail.el
+++ b/lisp/ol-rmail.el
@@ -31,7 +31,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ol)
diff --git a/lisp/ol-w3m.el b/lisp/ol-w3m.el
index 6fb01a60d..3978f1f34 100644
--- a/lisp/ol-w3m.el
+++ b/lisp/ol-w3m.el
@@ -42,7 +42,8 @@ ;;; Acknowledgments:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ol)
diff --git a/lisp/ol.el b/lisp/ol.el
index 9ad191c8f..284df4c18 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -28,7 +28,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-compat)
(require 'org-macs)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 2ec2f4c00..d9f9940d6 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -46,7 +46,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ol)
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index e74c59a51..b160f5a83 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
(require 'cl-lib)
diff --git a/lisp/org-attach-git.el b/lisp/org-attach-git.el
index 4763aefd4..d0169bc3c 100644
--- a/lisp/org-attach-git.el
+++ b/lisp/org-attach-git.el
@@ -30,7 +30,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-attach)
(require 'vc-git)
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index e8b27751e..3838d1bad 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -35,7 +35,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index a696c615b..52147a95b 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -48,7 +48,8 @@ ;;; TODO
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index f9daf3f14..657c4df09 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 92a3b473d..c8deead9e 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org)
diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index b5df115cf..f2a9e972a 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -55,7 +55,8 @@ ;;; Thanks:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'org-compat)
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index 5dd2bfd59..e29f09fce 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -136,7 +136,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(eval-when-compile (require 'cl-lib))
(require 'org)
diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el
index 90fc95f41..bff572238 100644
--- a/lisp/org-cycle.el
+++ b/lisp/org-cycle.el
@@ -30,7 +30,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'org-fold)
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index 035ef047a..c1f469aec 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -31,7 +31,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
diff --git a/lisp/org-duration.el b/lisp/org-duration.el
index 2919efd4c..3c91d7c3b 100644
--- a/lisp/org-duration.el
+++ b/lisp/org-duration.el
@@ -52,7 +52,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-macs)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 51729b3f3..df7c2298b 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -59,7 +59,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'avl-tree)
(require 'ring)
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 61083022b..3fc620d14 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -28,7 +28,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(declare-function org-mode "org" ())
(declare-function org-toggle-pretty-entities "org" ())
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 594c9a6e7..d0c5cba08 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(defgroup org-faces nil
"Faces in Org mode."
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index f0b294b4a..fe2e9a768 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -89,7 +89,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
(require 'sha1)
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 027ff9215..6ff8d8b2c 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -271,7 +271,8 @@ ;;; Performance considerations
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'org-compat)
diff --git a/lisp/org-fold.el b/lisp/org-fold.el
index 1b7ca22b0..b6239ff78 100644
--- a/lisp/org-fold.el
+++ b/lisp/org-fold.el
@@ -43,7 +43,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'org-fold-core)
--git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 6bdd0b32f..935242844 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
;;;; Declarations
diff --git a/lisp/org-goto.el b/lisp/org-goto.el
index 00bf5d46a..9e06e3fab 100644
--- a/lisp/org-goto.el
+++ b/lisp/org-goto.el
@@ -23,7 +23,8 @@ ;;; org-goto.el --- Fast navigation in an Org buffer -*- lexical-binding: t; -*
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
(require 'org-refile)
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index fb6a48b5f..9ac2b2db2 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org)
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 490e4ddee..0fdb0ee42 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -71,7 +71,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
(require 'org-refile)
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index fe5233878..569f02dcd 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -37,7 +37,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'org-compat)
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index cb7fdf88b..35d5bc5c5 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -79,7 +79,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index 37a150bb7..553bf40cb 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -28,7 +28,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 0e2967b6c..397ac7b7d 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -86,7 +86,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ob)
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 1fc99d070..1e35ad897 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -77,7 +77,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-macs)
diff --git a/lisp/org-macro.el b/lisp/org-macro.el
index 481e431c2..39900158b 100644
--- a/lisp/org-macro.el
+++ b/lisp/org-macro.el
@@ -48,7 +48,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-macs)
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 01395a4b6..3e207c7ec 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -32,7 +32,8 @@ ;;; Commentary:
;; application that uses the same conventions could be used.
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org)
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 3b2c4cba6..3afaa2879 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -137,7 +137,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
(require 'cl-lib)
diff --git a/lisp/org-num.el b/lisp/org-num.el
index cbe5e455e..47e60befe 100644
--- a/lisp/org-num.el
+++ b/lisp/org-num.el
@@ -62,7 +62,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-macs)
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 0567052c0..d8d9301f8 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -27,7 +27,8 @@ ;;; Code:
;;;; Require other packages
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-macs)
(require 'org-compat)
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 01078f459..90c611e70 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -150,7 +150,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org-compat)
(require 'org-id)
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index fe61e9ace..248a6a9d3 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -32,7 +32,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 2b07a377e..2a95f5887 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -129,7 +129,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
(require 'ol)
diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 5a41c022f..a6d20a1a7 100644
--- a/lisp/org-refile.el
+++ b/lisp/org-refile.el
@@ -26,7 +26,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'org)
diff --git a/lisp/org-src.el b/lisp/org-src.el
index aadd8eba5..0296eca58 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -32,7 +32,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ob-comint)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 5116b1127..2aad9b850 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -35,7 +35,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-macs)
diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el
index 81ec8fdcc..61dbca629 100644
--- a/lisp/org-tempo.el
+++ b/lisp/org-tempo.el
@@ -39,7 +39,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'tempo)
(require 'cl-lib)
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 919630e69..260ac550d 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -36,7 +36,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-clock)
diff --git a/lisp/org.el b/lisp/org.el
index af2cf93e2..394a9d044 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -72,7 +72,8 @@ (defvar org-inlinetask-min-level)
;;;; Require other packages
(require 'org-compat)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 692dd216d..c59463d84 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -29,7 +29,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ox)
(require 'ox-publish)
diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el
index 689bf1559..72af13d80 100644
--- a/lisp/ox-beamer.el
+++ b/lisp/ox-beamer.el
@@ -31,7 +31,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ox-latex)
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index b27254b8a..4af22ec1a 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -32,7 +32,8 @@ ;;; Code:
;;; Dependencies
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'format-spec)
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index 81a77a770..7419b9559 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -33,7 +33,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'org-agenda)
diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el
index 33eb0597b..72d19ab2f 100644
--- a/lisp/ox-koma-letter.el
+++ b/lisp/ox-koma-letter.el
@@ -166,7 +166,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ox-latex)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 50a0950aa..134c8e417 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -28,7 +28,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ox)
diff --git a/lisp/ox-man.el b/lisp/ox-man.el
index bb716f7b9..3802f23a8 100644
--- a/lisp/ox-man.el
+++ b/lisp/ox-man.el
@@ -38,7 +38,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ox)
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index 5be0ca22e..95fa40a8f 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -30,7 +30,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ox-html)
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index cf217c9e7..b74d0c770 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -26,7 +26,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'format-spec)
diff --git a/lisp/ox-org.el b/lisp/ox-org.el
index ed72cf4f2..5d9655224 100644
--- a/lisp/ox-org.el
+++ b/lisp/ox-org.el
@@ -26,7 +26,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'ox)
(declare-function htmlize-buffer "ext:htmlize" (&optional buffer))
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index f9c3877d7..b751e144f 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -39,7 +39,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'format-spec)
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index f822f3d11..e13275806 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -27,7 +27,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ox)
diff --git a/lisp/ox.el b/lisp/ox.el
index 6f819def9..a5355f072 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -73,7 +73,8 @@ ;;; Commentary:
;;; Code:
(require 'org-macs)
-(org-assert-version)
+(unless (version< emacs-version "29")
+ (org-assert-version))
(require 'cl-lib)
(require 'ob-exp)
--
2.39.1
[-- Attachment #3: Type: text/plain, Size: 224 bytes --]
--
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>
next prev parent reply other threads:[~2023-03-29 13:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-01 7:26 [PATCH] Autoload `org-assert-version' and remove org-loaddefs.el Bastien
2022-12-02 3:38 ` Kyle Meyer
2022-12-02 7:44 ` Bastien
2022-12-03 4:18 ` Kyle Meyer
2022-12-06 3:54 ` David Masterson
2022-12-06 5:44 ` tomas
2022-12-06 7:13 ` David Masterson
2022-12-07 11:43 ` Ihor Radchenko
2022-12-07 14:08 ` Max Nikulin
2023-03-29 13:38 ` Ihor Radchenko [this message]
2023-03-29 16:04 ` Max Nikulin
2023-03-29 16:52 ` Ihor Radchenko
2023-04-01 14:44 ` Max Nikulin
2023-04-02 8:35 ` Ihor Radchenko
2023-04-02 15:59 ` Max Nikulin
2023-04-02 16:44 ` Ihor Radchenko
2023-04-04 12:08 ` Max Nikulin
2023-04-04 13:29 ` Ihor Radchenko
2023-04-05 11:41 ` Max Nikulin
2023-04-08 16:47 ` Max Nikulin
2023-04-09 8:29 ` Ihor Radchenko
2023-04-10 6:13 ` Max Nikulin
2023-04-10 16:58 ` Ihor Radchenko
2023-06-04 10:58 ` Max Nikulin
2022-12-06 3:00 ` David Masterson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o7obn0dp.fsf@localhost \
--to=yantar92@posteo.net \
--cc=bzg@gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=kyle@kyleam.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).