[Emacs-diffs] emacs/lisp/emacs-lisp byte-run.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/30 03:00:18

Modified files:
        lisp/emacs-lisp: byte-run.el 

Log message:
        (macro-declaration-function): Disallow declare specs with lengths of 3
        or more.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/byte-run.el?cvsroot=emacs&r1=1.35&r2=1.36

Patches:
Index: byte-run.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/byte-run.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- byte-run.el 6 May 2008 03:21:10 -0000       1.35
+++ byte-run.el 30 Nov 2008 03:00:18 -0000      1.36
@@ -45,14 +45,19 @@
     ;; Ignore the first element of `decl' (it's always `declare').
     (while (setq decl (cdr decl))
       (setq d (car decl))
-      (cond ((and (consp d) (eq (car d) 'indent))
+      (if (and (consp d)
+              (listp (cdr d))
+              (null (cdr (cdr d))))
+         (cond ((eq (car d) 'indent)
             (put macro 'lisp-indent-function (car (cdr d))))
-           ((and (consp d) (eq (car d) 'debug))
+               ((eq (car d) 'debug)
             (put macro 'edebug-form-spec (car (cdr d))))
-           ((and (consp d) (eq (car d) 'doc-string))
+               ((eq (car d) 'doc-string)
             (put macro 'doc-string-elt (car (cdr d))))
            (t
-            (message "Unknown declaration %s" d))))))
+                (message "Unknown declaration %s" d)))
+       (message "Invalid declaration %s" d)))))
+
 
 (setq macro-declaration-function 'macro-declaration-function)