From 3edc205093b755a52f0bf47dd486d264fc84ddc7 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Sun, 23 Jul 2023 11:26:40 +0200 Subject: Relax compat-loaded-features test --- compat-tests.el | 5 ++++- compat.el | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compat-tests.el b/compat-tests.el index 60e652b..f86bfff 100644 --- a/compat-tests.el +++ b/compat-tests.el @@ -82,7 +82,10 @@ (ert-deftest compat-loaded-features () (let ((version 0)) (while (< version 30) - (should-equal (> version emacs-major-version) + (should-equal (or (> version emacs-major-version) + ;; TODO Remove when Emacs 29.1 available on CI + (and (= 29 version emacs-major-version) + (= 0 emacs-minor-version))) (featurep (intern (format "compat-%s" version)))) (setq version (1+ version))))) diff --git a/compat.el b/compat.el index 2da7bb4..4b00244 100644 --- a/compat.el +++ b/compat.el @@ -50,7 +50,7 @@ ;; time and runtime, but only if needed. (eval-when-compile (defmacro compat--maybe-require-29 () - (when (< emacs-major-version 29) + (when (version< emacs-version "29.1") (require 'compat-29) '(require 'compat-29)))) (compat--maybe-require-29) -- cgit v1.0