From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 30 Nov 2008 03:00:18 +0000 (+0000)
Subject: (macro-declaration-function): Disallow declare specs with lengths of 3
X-Git-Tag: emacs-pretest-23.0.90~1415
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15183da6713f68246465768d5d09c91446a6511f;p=emacs.git

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

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 03fd5bfee3c..03908d90021 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -45,14 +45,19 @@ The return value of this function is not used."
     ;; 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))
-	     (put macro 'lisp-indent-function (car (cdr d))))
-	    ((and (consp d) (eq (car d) 'debug))
-	     (put macro 'edebug-form-spec (car (cdr d))))
-	    ((and (consp d) (eq (car d) 'doc-string))
-	     (put macro 'doc-string-elt (car (cdr d))))
-	    (t
-	     (message "Unknown declaration %s" d))))))
+      (if (and (consp d)
+	       (listp (cdr d))
+	       (null (cdr (cdr d))))
+	  (cond ((eq (car d) 'indent)
+		 (put macro 'lisp-indent-function (car (cdr d))))
+		((eq (car d) 'debug)
+		 (put macro 'edebug-form-spec (car (cdr d))))
+		((eq (car d) 'doc-string)
+		 (put macro 'doc-string-elt (car (cdr d))))
+		(t
+		 (message "Unknown declaration %s" d)))
+	(message "Invalid declaration %s" d)))))
+
 
 (setq macro-declaration-function 'macro-declaration-function)