(error): Remove support for old calling convention

* lisp/subr.el (error): Remove support for the Emacs 22 calling
convention '(error &rest args)'.

(cherry picked from commit a6a4ad13e48c656a530bea37d251a2dc55cc47d8)

diff --git a/etc/NEWS b/etc/NEWS
index a3b72666dabfb69b1e7f3d74b4acaf1f13eaaed7..688ac56c81a37774121cbd838d73aff290241515 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -149,6 +149,9 @@ positives.
 \f
 * Incompatible Lisp Changes in Emacs 31.1
 
+** The obsolete calling convention of 'error' has been removed.
+That convention was: '(error &rest ARGS)'.
+
 \f
 * Lisp Changes in Emacs 31.1
 

diff --git a/lisp/subr.el b/lisp/subr.el
index 7822286ef46a7a90b3937b6b6d8569048946cbf7..edfac77d50bf79523f74175d80e964fdc47067d6 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -463,8 +463,7 @@ Also see `ignore'."
   (declare (pure t) (side-effect-free error-free))
   t)
 
-;; Signal a compile-error if the first arg is missing.
-(defun error (&rest args)
+(defun error (string &rest args)
   "Signal an error, making a message by passing ARGS to `format-message'.
 Errors cause entry to the debugger when `debug-on-error' is non-nil.
 This can be overridden by `debug-ignored-errors'.
@@ -481,9 +480,8 @@ 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 (&rest t) nil))
-           (advertised-calling-convention (string &rest args) "23.1"))
-  (signal 'error (list (apply #'format-message args))))
+  (declare (ftype (function (string &rest t) nil)))
+  (signal 'error (list (apply #'format-message string args))))
 
 (defun user-error (format &rest args)
   "Signal a user error, making a message by passing ARGS to `format-message'.