branch: externals/compat
commit 299d70ecea004d06907dc6948ff6cb34d3aa2897
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Exclusive bounds for :max-version
---
compat-27.el | 6 +++---
compat-macs.el | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/compat-27.el b/compat-27.el
index f3f6d5b6a1..4dd6f6b317 100644
--- a/compat-27.el
+++ b/compat-27.el
@@ -39,7 +39,7 @@ is nil)."
"Return OBJECT's length if it is a proper list, nil otherwise.
A proper list is neither circular nor dotted (i.e., its last cdr
is nil)."
- :max-version "25.99"
+ :max-version "26"
;; On Emacs older than 26.1 we have to use the Tortoise and Hare algorithm
(when (listp object)
(catch 'cycle
@@ -717,7 +717,7 @@ The return value is a string (or nil in case we can’t find
it)."
(compat-defun make-prop-match (&rest attr) ;; <OK>
"Constructor for objects of type ‘prop-match’."
- :max-version "25.99"
+ :max-version "26"
:feature text-property-search
(vector
'prop-match
@@ -737,7 +737,7 @@ The return value is a string (or nil in case we can’t find
it)."
(compat-defun prop-match-p (match) ;; <OK>
"Return non-nil if MATCH is a `prop-match' object."
- :max-version "25.99"
+ :max-version "26"
:feature text-property-search
(and (vectorp match) ;; Vector
(> (length match) 0)
diff --git a/compat-macs.el b/compat-macs.el
index 73e2f0ab53..247ecfbe84 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -53,11 +53,11 @@ be installed). ATTR is a plist used to modify the generated
code. The following attributes are handled, all others are
ignored:
-- :min-version :: Prevent the compatibility definition from begin
- installed in versions older than indicated (string).
+- :min-version :: Do not install the compatibility definition
+ if Emacs version older than indicated.
-- :max-version :: Prevent the compatibility definition from begin
- installed in versions newer than indicated (string).
+- :max-version :: Do not install the compatibility definition
+ if Emacs version newer or equal than indicated.
- :feature :: The library the code is supposed to be loaded
with (via `eval-after-load').
@@ -94,7 +94,7 @@ ignored:
((or (and min-version
(version< emacs-version min-version))
(and max-version
- (version< max-version emacs-version)))
+ (version<= max-version emacs-version)))
nil)
((plist-get attr :explicit)
t)
