(cl-transform-lambda): Recognize `declare' as well as `interactive',

so that defmacro* would recognize `declare' forms.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da4e1c8997626f67ffa2a0fcf305b47cc4b9ee9a..fcf570a341396a347e1a4d0976389db660e14670 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-07  Johan  Bockg\e,Ae\e(Brd  <bojohan@dd.chalmers.se>
+
+       * emacs-lisp/cl-macs.el (cl-transform-lambda): Recognize `declare'
+       as well as `interactive', so that defmacro* would recognize
+       `declare' forms.
+
 2005-05-07  Eli Zaretskii  <eliz@gnu.org>
 
        * emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name): Explain

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 4a46801763ad4b9aae806e6dbb4039471738817f..aae2fd9f3d86fa564b5e92e32a28385db3d2406f 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -233,7 +233,8 @@ ARGLIST allows full Common Lisp conventions."
         (bind-defs nil) (bind-enquote nil)
         (bind-inits nil) (bind-lets nil) (bind-forms nil)
         (header nil) (simple-args nil))
-    (while (or (stringp (car body)) (eq (car-safe (car body)) 'interactive))
+    (while (or (stringp (car body))
+              (memq (car-safe (car body)) '(interactive declare)))
       (push (pop body) header))
     (setq args (if (listp args) (copy-list args) (list '&rest args)))
     (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p)))))