[elpa] externals/compat 94e3d6da16 2/3: Drop point releases from file names

[ELPA Syncer]

branch: externals/compat
commit 94e3d6da161f1cdccaf9fa40bcfdbf21c61a642a
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Drop point releases from file names
---
 Makefile                       | 10 +++++-----
 compat-24.4.el => compat-24.el | 26 +++++++++++++++++++++++---
 compat-25.1.el => compat-25.el |  6 +++---
 compat-26.1.el => compat-26.el |  8 ++++----
 compat-27.1.el => compat-27.el |  8 ++++----
 compat-28.1.el => compat-28.el | 10 +++++-----
 compat.el                      | 10 +++++-----
 7 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index cc98a4b7fe..1e63cb5998 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@
 EMACS = emacs
 BYTEC = compat-help.elc \
        compat-macs.elc \
-       compat-24.4.elc \
-       compat-25.1.elc \
-       compat-26.1.elc \
-       compat-27.1.elc \
-       compat-28.1.elc \
+       compat-24.elc \
+       compat-25.elc \
+       compat-26.elc \
+       compat-27.elc \
+       compat-28.elc \
        compat.elc
 
 all: compile test
diff --git a/compat-24.4.el b/compat-24.el
similarity index 94%
rename from compat-24.4.el
rename to compat-24.el
index d598518fc8..968f61525d 100644
--- a/compat-24.4.el
+++ b/compat-24.el
@@ -1,4 +1,4 @@
-;;; compat-24.4.el --- Compatibility Layer for Emacs 24.4  -*- 
lexical-binding: t; -*-
+;;; compat-24.el --- Compatibility Layer for Emacs 24.4  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2021 Free Software Foundation, Inc.
 
@@ -33,6 +33,7 @@
 
 (compat-defun = (number-or-marker &rest numbers-or-markers)
   "Handle multiple arguments."
+  :version "24.4"
   :prefix t
   (catch 'fail
     (while numbers-or-markers
@@ -43,6 +44,7 @@
 
 (compat-defun < (number-or-marker &rest numbers-or-markers)
   "Handle multiple arguments."
+  :version "24.4"
   :prefix t
   (catch 'fail
     (while numbers-or-markers
@@ -53,6 +55,7 @@
 
 (compat-defun > (number-or-marker &rest numbers-or-markers)
   "Handle multiple arguments."
+  :version "24.4"
   :prefix t
   (catch 'fail
     (while numbers-or-markers
@@ -63,6 +66,7 @@
 
 (compat-defun <= (number-or-marker &rest numbers-or-markers)
   "Handle multiple arguments."
+  :version "24.4"
   :prefix t
   (catch 'fail
     (while numbers-or-markers
@@ -73,6 +77,7 @@
 
 (compat-defun >= (number-or-marker &rest numbers-or-markers)
   "Handle multiple arguments."
+  :version "24.4"
   :prefix t
   (catch 'fail
     (while numbers-or-markers
@@ -87,6 +92,7 @@
 FILE is normally a feature name, but it can also be a file name,
 in case that file does not provide any feature.  See `eval-after-load'
 for more details about the different forms of FILE and their semantics."
+  :version "24.4"
   (declare (indent 1) (debug (form def-body)))
   ;; See https://nullprogram.com/blog/2018/02/22/ on how
   ;; `eval-after-load' is used to preserve compatibility with 24.3.
@@ -94,6 +100,7 @@ for more details about the different forms of FILE and their 
semantics."
 
 (compat-defun special-form-p (object)
   "Non-nil if and only if OBJECT is a special form."
+  :version "24.4"
   (if (and (symbolp object) (fboundp object))
       (setq object (condition-case nil
                        (indirect-function object)
@@ -102,6 +109,7 @@ for more details about the different forms of FILE and 
their semantics."
 
 (compat-defun macrop (object)
   "Non-nil if and only if OBJECT is a macro."
+  :version "24.4"
   (let ((def (condition-case nil
                  (indirect-function object)
                (void-function nil))))
@@ -113,6 +121,7 @@ for more details about the different forms of FILE and 
their semantics."
   "Return non-nil if SUFFIX is a suffix of STRING.
 If IGNORE-CASE is non-nil, the comparison is done without paying
 attention to case differences."
+  :version "24.4"
   (let ((start-pos (- (length string) (length suffix))))
     (and (>= start-pos 0)
          (eq t (compare-strings suffix nil nil
@@ -122,6 +131,7 @@ attention to case differences."
   "Extend `split-string' by a TRIM argument.
 The remaining arguments STRING, SEPARATORS and OMIT-NULLS are
 handled just as with `split-string'."
+  :version "24.4"
   :prefix t
   (let* ((token (split-string string separators omit-nulls))
          (trimmed (if trim
@@ -140,6 +150,7 @@ handled just as with `split-string'."
   "Destructively remove `equal' consecutive duplicates from LIST.
 First and last elements are considered consecutive if CIRCULAR is
 non-nil."
+  :version "24.4"
   (let ((tail list) last)
     (while (cdr tail)
       (if (equal (car tail) (cadr tail))
@@ -158,6 +169,7 @@ MESSAGE is a string that will be output to the echo area if 
such an error
 is signaled without being caught by a `condition-case'.
 PARENT is either a signal or a list of signals from which it inherits.
 Defaults to `error'."
+  :version "24.4"
   (unless parent (setq parent 'error))
   (let ((conditions
          (if (consp parent)
@@ -176,6 +188,7 @@ Defaults to `error'."
 
 (compat-advise require (feature &rest args)
   "Allow for Emacs 24.x to require the inexistent FEATURE subr-x."
+  :version "24.4"
   ;; As the compatibility advise around `require` is more a hack than
   ;; of of actual value, the highlighting is suppressed.
   :no-highlight t
@@ -188,6 +201,7 @@ Defaults to `error'."
 
 (compat-defun hash-table-keys (hash-table)
   "Return a list of keys in HASH-TABLE."
+  :version "24.4"
   (let (values)
     (maphash
      (lambda (k _v) (push k values))
@@ -196,6 +210,7 @@ Defaults to `error'."
 
 (compat-defun hash-table-values (hash-table)
   "Return a list of values in HASH-TABLE."
+  :version "24.4"
   (let (values)
     (maphash
      (lambda (_k v) (push v values))
@@ -204,31 +219,36 @@ Defaults to `error'."
 
 (compat-defun string-empty-p (string)
   "Check whether STRING is empty."
+  :version "24.4"
   (string= string ""))
 
 (compat-defun string-join (strings &optional separator)
   "Join all STRINGS using SEPARATOR.
 Optional argument SEPARATOR must be a string, a vector, or a list of
 characters; nil stands for the empty string."
+  :version "24.4"
   (mapconcat #'identity strings separator))
 
 (compat-defun string-blank-p (string)
   "Check whether STRING is either empty or only whitespace.
 The following characters count as whitespace here: space, tab, newline and
 carriage return."
+  :version "24.4"
   (string-match-p "\\`[ \t\n\r]*\\'" string))
 
 (compat-defun string-remove-prefix (prefix string)
   "Remove PREFIX from STRING if present."
+  :version "24.4"
   (if (string-prefix-p prefix string)
       (substring string (length prefix))
     string))
 
 (compat-defun string-remove-suffix (suffix string)
   "Remove SUFFIX from STRING if present."
+  :version "24.4"
   (if (string-suffix-p suffix string)
       (substring string 0 (- (length string) (length suffix)))
     string))
 
-(provide 'compat-24.4)
-;;; compat-24.4.el ends here
+(provide 'compat-24)
+;;; compat-24.el ends here
diff --git a/compat-25.1.el b/compat-25.el
similarity index 98%
rename from compat-25.1.el
rename to compat-25.el
index 0884950bee..f84cf200da 100644
--- a/compat-25.1.el
+++ b/compat-25.el
@@ -1,4 +1,4 @@
-;;; compat-25.1.el --- Compatibility Layer for Emacs 25.1  -*- 
lexical-binding: t; -*-
+;;; compat-25.el --- Compatibility Layer for Emacs 25.1  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2021 Free Software Foundation, Inc.
 
@@ -256,5 +256,5 @@ threading."
                 form))))))))
    (t form)))
 
-(provide 'compat-25.1)
-;;; compat-25.1.el ends here
+(provide 'compat-25)
+;;; compat-25.el ends here
diff --git a/compat-26.1.el b/compat-26.el
similarity index 98%
rename from compat-26.1.el
rename to compat-26.el
index 5b9e6fbb43..bab8bbbe46 100644
--- a/compat-26.1.el
+++ b/compat-26.el
@@ -1,4 +1,4 @@
-;;; compat-26.1.el --- Compatibility Layer for Emacs 26.1  -*- 
lexical-binding: t; -*-
+;;; compat-26.el --- Compatibility Layer for Emacs 26.1  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2021 Free Software Foundation, Inc.
 
@@ -78,7 +78,7 @@ from the absolute start of the buffer, disregarding the 
narrowing."
 
 ;;;; Defined in subr.el
 
-(declare-function compat--alist-get-full-elisp "compat-25.1"
+(declare-function compat--alist-get-full-elisp "compat-25"
                   (key alist &optional default remove testfn))
 (compat-defun alist-get (key alist &optional default remove testfn)
   "Handle TESTFN manually."
@@ -295,5 +295,5 @@ the variable `temporary-file-directory' is returned."
           default-directory
         temporary-file-directory))))
 
-(provide 'compat-26.1)
-;;; compat-26.1.el ends here
+(provide 'compat-26)
+;;; compat-26.el ends here
diff --git a/compat-27.1.el b/compat-27.el
similarity index 98%
rename from compat-27.1.el
rename to compat-27.el
index 2855fc6301..cba7c61d91 100644
--- a/compat-27.1.el
+++ b/compat-27.el
@@ -1,4 +1,4 @@
-;;; compat-27.1.el --- Compatibility Layer for Emacs 27.1  -*- 
lexical-binding: t; -*-
+;;; compat-27.el --- Compatibility Layer for Emacs 27.1  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2021 Free Software Foundation, Inc.
 
@@ -176,7 +176,7 @@ OBJECT."
               (equal (json-parse-string "[]") nil))
           (json-unavailable t)
           (void-function t))
-  (insert (apply #'compat--json-serialize object args)))
+  (insert (apply #'json-serialize object args)))
 
 (compat-defun json-parse-string (string &rest args)
   "Parse the JSON STRING into a Lisp object.
@@ -494,5 +494,5 @@ The return value is a string (or nil in case we can’t find 
it)."
             (or (lm-header "package-version")
                 (lm-header "version")))))))))
 
-(provide 'compat-27.1)
-;;; compat-27.1.el ends here
+(provide 'compat-27)
+;;; compat-27.el ends here
diff --git a/compat-28.1.el b/compat-28.el
similarity index 98%
rename from compat-28.1.el
rename to compat-28.el
index 028893bf4e..f2a27b8758 100644
--- a/compat-28.1.el
+++ b/compat-28.el
@@ -1,4 +1,4 @@
-;;; compat-28.1.el --- Compatibility Layer for Emacs 28.1  -*- 
lexical-binding: t; -*-
+;;; compat-28.el --- Compatibility Layer for Emacs 28.1  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2021 Free Software Foundation, Inc.
 
@@ -502,8 +502,8 @@ as the new values of the bound variables in the recursive 
invocation."
 
 ;;;; Defined in files.el
 
-(declare-function compat--string-trim-left "compat-26.1" (string &optional 
regexp))
-(declare-function compat--directory-name-p "compat-25.1" (name))
+(declare-function compat--string-trim-left "compat-26" (string &optional 
regexp))
+(declare-function compat--directory-name-p "compat-25" (name))
 (compat-defun file-name-with-extension (filename extension)
   "Set the EXTENSION of a FILENAME.
 The extension (in a file name) is the part that begins with the last \".\".
@@ -662,5 +662,5 @@ directory or directories specified."
     (apply 'update-directory-autoloads
            (if (listp dir) dir (list dir)))))
 
-(provide 'compat-28.1)
-;;; compat-28.1.el ends here
+(provide 'compat-28)
+;;; compat-28.el ends here
diff --git a/compat.el b/compat.el
index 833fe43a55..de4b0e515a 100644
--- a/compat.el
+++ b/compat.el
@@ -157,11 +157,11 @@
                   (push form defs))))))
         (cons 'progn (nreverse defs)))))))
 
-(compat-insert "24.4")
-(compat-insert "25.1")
-(compat-insert "26.1")
-(compat-insert "27.1")
-(compat-insert "28.1")
+(compat-insert "24")
+(compat-insert "25")
+(compat-insert "26")
+(compat-insert "27")
+(compat-insert "28")
 
 (provide 'compat)
 ;;; compat.el ends here