* lisp/emacs-lisp/autoload.el (make-autoload): Preload the macros's

declarations that are useful before running the macro.
* src/eval.c (Fdefmacro): Only obey one declaration.

2 files changed, 4 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index aa3e239aeec..45cccea1ebb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * eval.c (Fdefmacro): Only obey one declaration.
+
         * casefiddle.c (casify_region): Setup gl_state.
 
 2010-08-18  Jan Djärv  <jan.h.d@swipnet.se>
diff --git a/src/eval.c b/src/eval.c
index f127ef03293..5c6b268187b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -690,8 +690,8 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
       tail = XCDR (tail);
     }
 
-  while (CONSP (Fcar (tail))
-         && EQ (Fcar (Fcar (tail)), Qdeclare))
+  if (CONSP (Fcar (tail))
+      && EQ (Fcar (Fcar (tail)), Qdeclare))
     {
       if (!NILP (Vmacro_declaration_function))
         {