From: Glenn Morris <rgm@gnu.org>
Date: Tue, 5 May 2015 00:17:35 +0000 (-0400)
Subject: * lisp/emacs-lisp/check-declare.el (check-declare-verify):
X-Git-Tag: emacs-25.0.90~2212
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2f3c8071b79b6e0dff73d5fbc1dcaab0d8f2fbe;p=emacs.git

* lisp/emacs-lisp/check-declare.el (check-declare-verify):

Handle cl-defgeneric, cl-defmethod.
---

diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index a7045ad8f22..7269b83b619 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -157,6 +157,7 @@ is a string giving details of the error."
           (setq re (format (if cflag
                                "^[ \t]*\\(DEFUN\\)[ \t]*([ \t]*\"%s\""
                              "^[ \t]*(\\(fset[ \t]+'\\|\
+cl-def\\(?:generic\\|method\\)\\|\
 def\\(?:un\\|subst\\|foo\\|method\\|class\\|\
 ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\\|\
 \\(?:ine-obsolete-function-\\)?alias[ \t]+'\\|\
@@ -200,8 +201,8 @@ ine-overloadable-function\\)\\)\
                               type)
                              'obsolete)
                             ;; Can't easily check arguments in these cases.
-                            ((string-match "\\`\\(def\\(alias\\|\
-method\\|class\\)\\|fset\\)\\>" type)
+                            ((string-match "\\`\\(def\\(alias\\|class\\)\\|\
+fset\\|\\(?:cl-\\)?defmethod\\)\\>" type)
                              t)
                             ((looking-at "\\((\\|nil\\)")
                              (byte-compile-arglist-signature