Fix some function type declaration

* lisp/window.el (get-lru-window, get-largest-window): Fix
function type declaration.
* lisp/subr.el (error): Likewise.

(cherry picked from commit 976416bebe278a7cf65ab58b1918c9c27e3a09bd)

diff --git a/lisp/subr.el b/lisp/subr.el
index 1d21c012d49ae6959f212121cf90da2a2b6754f4..7822286ef46a7a90b3937b6b6d8569048946cbf7 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -481,7 +481,7 @@ for the sake of consistency.
 
 To alter the look of the displayed error messages, you can use
 the `command-error-function' variable."
-  (declare (ftype (function (string &rest t) nil))
+  (declare (ftype (function (&rest t) nil))
            (advertised-calling-convention (string &rest args) "23.1"))
   (signal 'error (list (apply #'format-message args))))
 

diff --git a/lisp/window.el b/lisp/window.el
index decb98ff501d86b5b0e5a65caaa516daa5763b41..3d9cdc64184556aab1df78b1bcf6d6d002a9bf31 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2514,7 +2514,7 @@ have special meanings:
 
 Any other value of ALL-FRAMES means consider all windows on the
 selected frame and no others."
-  (declare (ftype (function (&optional t t t) (or window null)))
+  (declare (ftype (function (&optional t t t t) (or window null)))
            (side-effect-free error-free))
   (let ((windows (window-list-1 nil 'nomini all-frames))
         best-window best-time second-best-window second-best-time time)
@@ -2594,7 +2594,7 @@ have special meanings:
 
 Any other value of ALL-FRAMES means consider all windows on the
 selected frame and no others."
-  (declare (ftype (function (&optional t t t) (or window null)))
+  (declare (ftype (function (&optional t t t t) (or window null)))
            (side-effect-free error-free))
   (let ((best-size 0)
        best-window size)