2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af456bd5d2e..856d4ea3898 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):
+        Don't macroexpand before evaluating in eval-and-compile, in case
+        `body's macro expansion uses macros and functions defined in itself.
+
 2010-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/bytecomp.el (byte-compile-check-variable):
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 490d928c5a0..df93528683c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -479,10 +479,7 @@ This list lives partly on the stack.")
                                 (cons 'progn body)
                                 byte-compile-initial-macro-environment))))))
     (eval-and-compile . (lambda (&rest body)
-                          (byte-compile-eval-before-compile
-                           (macroexpand-all
-                            (cons 'progn body)
-                            byte-compile-initial-macro-environment))
+                          (byte-compile-eval-before-compile (cons 'progn body))
                           (cons 'progn body))))
   "The default macro-environment passed to macroexpand by the compiler.
 Placing a macro here will cause a macro to have different semantics when