(check-declare-verify): Tweak regexp for end of function-name. Handle

define-derived-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 784c2d09da84be4f2329bf9e22b43a6f16e96404..300ae8b628b72ed975ac16a4f378bdba5a50dada 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-20  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/check-declare.el (check-declare-verify): Tweak regexp
+       for end of function-name.  Handle define-derived-mode.
+
 2007-11-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * progmodes/idlw-help.el: Require browse-url unconditionally, it

diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index 0b78da165dbba4eac2fbb6e46a55dabdfa9039e0..c3e410865998254f4403e58e3c0f19f14bec412d 100644 (file)
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -86,14 +86,18 @@ found to be true, otherwise a list of errors with elements of the form
         (with-temp-buffer
           (insert-file-contents fnfile)
           ;; defsubst's don't _have_ to be known at compile time.
-          (setq re (format "^[ \t]*(def\\(un\\|subst\\)[ \t]+%s\\>"
+          (setq re (format "^[ \t]*(\\(def\\(?:un\\|subst\\|\
+ine-derived-mode\\)\\)\[ \t]+%s\\([ \t;]+\\|$\\)"
                            (regexp-opt (mapcar 'cadr fnlist) t)))
           (while (re-search-forward re nil t)
             (skip-chars-forward " \t\n")
             (setq fn (match-string 2)
-                  sig (if (looking-at "\\((\\|nil\\)")
-                          (byte-compile-arglist-signature
-                           (read (current-buffer))))
+                  sig (if (string-equal "define-derived-mode"
+                                        (match-string 1))
+                          '(0 . 0)
+                        (if (looking-at "\\((\\|nil\\)")
+                            (byte-compile-arglist-signature
+                             (read (current-buffer)))))
                   ;; alist of functions and arglist signatures.
                   siglist (cons (cons fn sig) siglist)))))
     (dolist (e fnlist)