(elint-init-form): Report declarations where the filename is not a string.

2 files changed, 15 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05837378097..a6c42130907 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,15 @@
 2009-09-30  Glenn Morris  <rgm@gnu.org>
 
+        * cedet/semantic/analyze/fcn.el (semantic-scope-find): Fix declaration.
+
         * cedet/semantic/bovine/gcc.el (semantic-gcc-setup): Replace runtime use
         of CL function `remove-if-not'.
 
         * emacs-lisp/authors.el (authors-ignored-files): Add "js2-mode.el".
 
+        * emacs-lisp/elint.el (elint-init-form): Report declarations where the
+        filename is not a string.
+
 2009-09-29  Chong Yidong  <cyd@stupidchicken.com>
 
         * files.el (safe-local-eval-forms): Fix typo.
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 27e7a7f293a..59be145d7ec 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -420,11 +420,16 @@ Return nil if there are no more forms, t otherwise."
    ((eq (car form) 'autoload)
     (setq env (elint-env-add-func env (cadr (cadr form)) 'unknown)))
    ((eq (car form) 'declare-function)
-    (setq env (elint-env-add-func env (cadr form)
-                                  (if (or (< (length form) 4)
-                                          (eq (nth 3 form) t))
-                                      'unknown
-                                    (nth 3 form)))))
+    (setq env (elint-env-add-func
+               env (cadr form)
+               (if (or (< (length form) 4)
+                       (eq (nth 3 form) t)
+                       (unless (stringp (nth 2 form))
+                         (elint-error "Malformed declaration for `%s'"
+                                      (cadr form))
+                         t))
+                   'unknown
+                 (nth 3 form)))))
    ((and (eq (car form) 'defalias) (listp (nth 2 form)))
     ;; If the alias points to something already in the environment,
     ;; add the alias to the environment with the same arguments.