branch: externals/compat commit e4f5471d23c469a0b02152743bae17b3a6eb9d5d Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Chained requiring, remove unnecessary declare-functions --- compat-24.el | 1 - compat-25.el | 2 +- compat-26.el | 4 +--- compat-27.el | 8 +------- compat-28.el | 4 +--- compat-29.el | 7 +------ compat.el | 5 ----- 7 files changed, 5 insertions(+), 26 deletions(-) diff --git a/compat-24.el b/compat-24.el index 533c9f68c7..6add3c056d 100644 --- a/compat-24.el +++ b/compat-24.el @@ -33,7 +33,6 @@ ;;; Code: (eval-when-compile (load "compat-macs.el" nil t t)) - (compat-declare-version "24.4") ;;;; Defined in data.c diff --git a/compat-25.el b/compat-25.el index fe241b0081..891ebfa67d 100644 --- a/compat-25.el +++ b/compat-25.el @@ -27,8 +27,8 @@ ;;; Code: +(require 'compat-24) (eval-when-compile (load "compat-macs.el" nil t t)) - (compat-declare-version "25.1") ;;;; Defined in alloc.c diff --git a/compat-26.el b/compat-26.el index 8a56a460ab..bded43b32f 100644 --- a/compat-26.el +++ b/compat-26.el @@ -32,8 +32,8 @@ ;;; Code: +(require 'compat-25) (eval-when-compile (load "compat-macs.el" nil t t)) - (compat-declare-version "26.1") ;;;; Defined in eval.c @@ -148,8 +148,6 @@ from the absolute start of the buffer, disregarding the narrowing." ;;;; Defined in subr.el -(declare-function compat--alist-get-full-elisp "compat-25" - (key alist &optional default remove testfn)) (declare-function alist-get nil (key alist &optional default remove)) (compat-defun alist-get (key alist &optional default remove testfn) "Handle TESTFN manually." diff --git a/compat-27.el b/compat-27.el index 7d162152ad..43d9897dfc 100644 --- a/compat-27.el +++ b/compat-27.el @@ -34,8 +34,8 @@ ;;; Code: +(require 'compat-26) (eval-when-compile (load "compat-macs.el" nil t t)) - (compat-declare-version "27.1") ;;;; Defined in fns.c @@ -596,9 +596,6 @@ in all cases, since that is the standard symbol for byte." (if (string= prefixed-unit "") "" (or space "")) prefixed-unit)))) -(declare-function compat--file-name-quote "compat-26" - (name &optional top)) - ;;*UNTESTED (compat-defun exec-path () "Return list of directories to search programs to run in remote subprocesses. @@ -633,9 +630,6 @@ the value of the variable `exec-path'." (nreverse path))))) (exec-path))) -(declare-function compat--file-local-name "compat-26" - (file)) - ;;*UNTESTED (compat-defun executable-find (command &optional remote) "Search for COMMAND in `exec-path' and return the absolute file name. diff --git a/compat-28.el b/compat-28.el index f9d422c6a6..c7316bd703 100644 --- a/compat-28.el +++ b/compat-28.el @@ -34,8 +34,8 @@ ;;; Code: +(require 'compat-27) (eval-when-compile (load "compat-macs.el" nil t t)) - (compat-declare-version "28.1") ;;;; Defined in fns.c @@ -606,8 +606,6 @@ as the new values of the bound variables in the recursive invocation." ;;;; Defined in files.el -(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 \".\". diff --git a/compat-29.el b/compat-29.el index 2fc03dbc40..1680a92fe3 100644 --- a/compat-29.el +++ b/compat-29.el @@ -30,8 +30,8 @@ ;;; Code: +(require 'compat-28) (eval-when-compile (load "compat-macs.el" nil t t)) - (compat-declare-version "29.1") ;;;; Defined in xdisp.c @@ -265,11 +265,6 @@ signalled. If NOERROR, the non-loop parts of the chain is returned." (push func chain)) chain)))) -(declare-function compat--provided-mode-derived-p - "compat-27" (mode &rest modes)) -(declare-function compat--func-arity - "compat-26" (func)) - ;;* UNTESTED (compat-defun buffer-match-p (condition buffer-or-name &optional arg) "Return non-nil if BUFFER-OR-NAME matches CONDITION. diff --git a/compat.el b/compat.el index ad30c93e60..16c9b7db28 100644 --- a/compat.el +++ b/compat.el @@ -40,11 +40,6 @@ ;;; Code: -(require 'compat-24) -(require 'compat-25) -(require 'compat-26) -(require 'compat-27) -(require 'compat-28) (require 'compat-29) (provide 'compat)