* lisp/emacs-lisp/gv.el (cond): Same fix as before for `if'.

* Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e799ead207b..8c8f88dc89b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/gv.el (cond): Same fix as before for `if'.
+
 2012-10-18  Glenn Morris  <rgm@gnu.org>
 
         * dired.el (dired-sort-toggle): Some ls implementations only allow
@@ -7,8 +11,8 @@
 
 2012-10-17  Kenichi Handa  <handa@gnu.org>
 
-        * international/mule.el (set-keyboard-coding-system): Recover
-        input meta mode when the new coding system doesn not use 8-bit.
+        * international/mule.el (set-keyboard-coding-system):
+        Recover input meta mode when the new coding system doesn not use 8-bit.
         Supply TERMINAL arg to set-input-meta-mode.
 
 2012-10-17  Michael Heerdegen <michael_heerdegen@web.de>  (tiny change)
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 1a30d67fbbc..d6c91539a90 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -377,7 +377,8 @@ The return value is the last VAL in the list.
 
 (put 'cond 'gv-expander
      (lambda (do &rest branches)
-       (if (macroexp-small-p (funcall do 'dummy (lambda (_) 'dummy)))
+       (if (or (not lexical-binding)  ;The other code requires lexical-binding.
+               (macroexp-small-p (funcall do 'dummy (lambda (_) 'dummy))))
            ;; This duplicates the `do' code, which is a problem if that
            ;; code is large, but otherwise results in more efficient code.
            `(cond