[Emacs-diffs] /srv/bzr/emacs/trunk r108516: * src/eval.c (Fmacroexpand): Stop if the macro returns the same form.

[Stefan Monnier]

------------------------------------------------------------
revno: 108516
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-07 22:47:26 -0400
message:
  * src/eval.c (Fmacroexpand): Stop if the macro returns the same form.
modified:
  src/ChangeLog
  src/eval.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-07 05:11:51 +0000
+++ b/src/ChangeLog     2012-06-08 02:47:26 +0000
@@ -1,3 +1,7 @@
+2012-06-08  Stefan Monnier  <address@hidden>
+
+       * eval.c (Fmacroexpand): Stop if the macro returns the same form.
+
 2012-06-07  Paul Eggert  <address@hidden>
 
        * doprnt.c (doprnt): Truncate multibyte char correctly.

=== modified file 'src/eval.c'
--- a/src/eval.c        2012-05-30 03:59:42 +0000
+++ b/src/eval.c        2012-06-08 02:47:26 +0000
@@ -1020,7 +1020,13 @@
          if (NILP (expander))
            break;
        }
-      form = apply1 (expander, XCDR (form));
+      {
+       Lisp_Object newform = apply1 (expander, XCDR (form));
+       if (EQ (form, newform))
+         break;
+       else
+         form = newform;
+      }
     }
   return form;
 }