Fix previous warning suppression change

* lisp/emacs-lisp/bytecomp.el (byte-compile-emit-callargs-warn)
(byte-compile-subr-wrong-args):
* lisp/emacs-lisp/byte-run.el (with-suppressed-warnings):
* lisp/cedet/semantic/fw.el (semantic-install-function-overrides):
The `wrong-args' warning is really called `callargs'.

diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index c60778a34dab9e1cc2ff720ed8a4ec631ecc7318..d07d8d42a8c18a148c90827add42cf197b7e15e2 100644 (file)
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -278,7 +278,7 @@ OVERRIDES will be installed globally for this major mode.  If MODE is
 nil, OVERRIDES will be installed locally in the current buffer.  This
 later installation should be done in MODE hook."
   (declare (obsolete define-mode-local-override "29.1"))
-  (with-suppressed-warnings ((wrong-args mode-local-bind))
+  (with-suppressed-warnings ((callargs mode-local-bind))
     (mode-local-bind
      ;; Add the semantic- prefix to OVERLOAD short names.
      (mapcar

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 2d11f350f0bab025acfb2397341e22b64922ddc8..0113051c8eb4388519bc108ba709990c08122b4e 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -637,7 +637,7 @@ The warnings that can be suppressed are a subset of the warnings
 in `byte-compile-warning-types'; see the variable
 `byte-compile-warnings' for a fuller explanation of the warning
 types.  The types that can be suppressed with this macro are
-`free-vars', `callargs', `redefine', `obsolete', `wrong-args',
+`free-vars', `callargs', `redefine', `obsolete',
 `interactive-only', `lexical', `mapcar', `constants' and
 `suspicious'.
 

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 920cdbe5a6f20c96a7629ae67b6ff43dad4fa04c..61382d6989fedfa3fd341d2167a3f5d9537faa1d 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1494,7 +1494,7 @@ when printing the error message."
                 byte-compile-unresolved-functions)))))
 
 (defun byte-compile-emit-callargs-warn (name actual-args min-args max-args)
-  (when (byte-compile-warning-enabled-p 'wrong-args name)
+  (when (byte-compile-warning-enabled-p 'callargs name)
     (byte-compile-warn-x
      name
      "`%s' called with %d argument%s, but %s %s"
@@ -3839,7 +3839,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\""
 
 \f
 (defun byte-compile-subr-wrong-args (form n)
-  (when (byte-compile-warning-enabled-p 'wrong-args (car form))
+  (when (byte-compile-warning-enabled-p 'callargs (car form))
     (byte-compile-warn-x (car form)
                          "`%s' called with %d arg%s, but requires %s"
                          (car form) (length (cdr form))