Merge branch 'master' into emacs-29.1

1 files changed, 19 insertions, 145 deletions

diff --git a/compat.el b/compat.el
index c94a2f1..2cfd342 100644
--- a/compat.el
+++ b/compat.el
@@ -1,12 +1,12 @@
-;;; compat.el --- Compatibility Library              -*- lexical-binding: t; -*-
+;;; compat.el --- Emacs Lisp Compatibility Library -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022 Free Software Foundation, Inc.
 
 ;; Author: Philip Kaludercic <philipk@posteo.net>
-;; Maintainer: Philip Kaludercic <~pkal/public-inbox@lists.sr.ht>
-;; Version: 28.1.0.0-rc
-;; URL: https://git.sr.ht/~pkal/compat/
-;; Package-Requires: ((emacs "24.1") (nadvice "0.3"))
+;; Maintainer: Compat Development <~pkal/compat-devel@lists.sr.ht>
+;; Version: 28.1.2.0
+;; URL: https://sr.ht/~pkal/compat
+;; Package-Requires: ((emacs "24.3") (nadvice "0.3"))
 ;; Keywords: lisp
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -39,145 +39,19 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'compat-macs))
-
-;;;; Core functionality
-
-;; The implementation is extracted here so that compatibility advice
-;; can check if the right number of arguments are being handled.
-(defun compat-func-arity (func)
-  "A reimplementation of `func-arity' for FUNC."
-  (cond
-   ((or (null func) (and (symbolp func) (not (fboundp func))) )
-    (signal 'void-function func))
-   ((and (symbolp func) (not (null func)))
-    (compat-func-arity (symbol-function func)))
-   ((eq (car-safe func) 'macro)
-    (compat-func-arity (cdr func)))
-   ((subrp func)
-    (subr-arity func))
-   ((memq (car-safe func) '(closure lambda))
-    ;; See lambda_arity from eval.c
-    (when (eq (car func) 'closure)
-      (setq func (cdr func)))
-    (let ((syms-left (if (consp func)
-                         (car func)
-                       (signal 'invalid-function func)))
-          (min-args 0) (max-args 0) optional)
-      (catch 'many
-        (dolist (next syms-left)
-          (cond
-           ((not (symbolp next))
-            (signal 'invalid-function func))
-           ((eq next '&rest)
-            (throw 'many (cons min-args 'many)))
-           ((eq next '&optional)
-            (setq optional t))
-           (t (unless optional
-                (setq min-args (1+ min-args)))
-              (setq max-args (1+ max-args)))))
-        (cons min-args max-args))))
-   ((and (byte-code-function-p func) (numberp (aref func 0)))
-    ;; See get_byte_code_arity from bytecode.c
-    (let ((at (aref func 0)))
-      (cons (logand at 127)
-            (if (= (logand at 128) 0)
-                (ash at -8)
-              'many))))
-   ((and (byte-code-function-p func) (numberp (aref func 0)))
-    ;; See get_byte_code_arity from bytecode.c
-    (let ((at (aref func 0)))
-      (cons (logand at 127)
-            (if (= (logand at 128) 0)
-                (ash at -8)
-              'many))))
-   ((and (byte-code-function-p func) (listp (aref func 0)))
-    ;; Based on `byte-compile-make-args-desc', this is required for
-    ;; old versions of Emacs that don't use a integer for the argument
-    ;; list description, per e2abe5a13dffb08d6371b6a611bc39c3a9ac2bc6.
-    (let ((arglist (aref func 0)) (mandatory 0) nonrest)
-      (while (and arglist (not (memq (car arglist) '(&optional &rest))))
-        (setq mandatory (1+ mandatory))
-        (setq arglist (cdr arglist)))
-      (setq nonrest mandatory)
-      (when (eq (car arglist) '&optional)
-        (setq arglist (cdr arglist))
-        (while (and arglist (not (eq (car arglist) '&rest)))
-          (setq nonrest (1+ nonrest))
-          (setq arglist (cdr arglist))))
-      (cons mandatory (if arglist 'many nonrest))))
-   ((autoloadp func)
-    (autoload-do-load func)
-    (compat-func-arity func))
-   ((signal 'invalid-function func))))
-
-(eval-and-compile
-  (defun compat-maxargs-/= (func n)
-    "Non-nil when FUNC doesn't accept at most N arguments."
-    (condition-case nil
-        (not (eq (cdr (compat-func-arity func)) n))
-      (void-function t))))
-
-;; Load the actual compatibility definitions:
-(require 'compat-24.4)
-(require 'compat-25.1)
-(require 'compat-26.1)
-(require 'compat-27.1)
-(require 'compat-28.1)
-(require 'compat-29.1)
-
-;;;; Etcetera
-
-;; To ensure that compat.el is loaded as soon as possible, a require
-;; call is inserted directly into the autoload file:
-;;;###autoload (require 'compat)
-
-;;;;; Update defaults
-
-;; This section updates default values that have been updated in
-;; "future" versions of Emacs, and are relevant to users on older
-;; versions of Emacs.
-;;
-;; To prevent these changes from taking effect, set
-;; `compat-preserve-defaults' to t in your early-init.el on Emacs 27 or
-;; before calling `package-initialize' before Emacs 27.
-
-(defvar compat-preserve-defaults nil)
-
-(unless compat-preserve-defaults
-  ;; Add NonGNU ELPA to the list of package archives
-  (defvar package-archives)
-  (with-eval-after-load 'package
-    (when (or (equal '(("gnu" . "https://elpa.gnu.org/packages/"))
-                     package-archives)
-              (equal '(("gnu" . "http://elpa.gnu.org/packages/"))
-                     package-archives))
-      (push (cons "nongnu"
-                  (format "http%s://elpa.nongnu.org/nongnu/"
-                          (if (and (fboundp 'gnutls-available-p)
-                                   (gnutls-available-p))
-                              "s" "")))
-            package-archives)))
-
-  ;; Change the default IRC server from Freenode to Libera.
-  (defvar rcirc-server-alist)
-  (with-eval-after-load 'rcirc
-    (when (equal '(("chat.freenode.net" :channels ("#rcirc")))
-                 rcirc-server-alist)
-      (setq rcirc-server-alist
-            (if (and (fboundp 'gnutls-available-p)
-                     (gnutls-available-p))
-                ;; The #emacs channel is not added here (even though
-                ;; it was added in 28.1), since that is a separate
-                ;; feature that doesn't need to be added here.
-                '(("irc.libera.chat" :channels ("#rcirc")
-                   :port 6697 :encryption tls))
-              '(("irc.libera.chat" :channels ("#rcirc")))))))
-
-  (defvar erc-default-server)
-  (with-eval-after-load 'erc
-    (when (equal erc-default-server "irc.freenode.net")
-      (setq erc-default-server "irc.libera.chat"))))
+(defvar compat--inhibit-prefixed)
+(let ((compat--inhibit-prefixed (not (bound-and-true-p compat-testing))))
+  ;; Instead of using `require', we manually check `features' and call
+  ;; `load' to avoid the issue of not using `provide' at the end of
+  ;; the file (which is disabled by `compat--inhibit-prefixed', so
+  ;; that the file can be loaded again at some later point when the
+  ;; prefixed definitions are needed).
+  (dolist (vers '(24 25 26 27 28))
+    (unless (memq (intern (format "compat-%d" vers)) features)
+      (load (format "compat-%d%s" vers
+                    (if (bound-and-true-p compat-testing)
+                        ".el" ""))
+            nil t))))
 
 (provide 'compat)
 ;;; compat.el ends here