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

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

Makefile.in

@@ -361,7 +361,7 @@ blessmail: Makefile src FRC
 # etc. to be built without running into similar recursion problems.
 MAKEFILE_NAME = Makefile
 $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
-          $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN)
+          $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) $(srcdir)/src/lisp.mk
 	MAKE='$(MAKE)' ./config.status
 
 # Don't erase these files if make is interrupted while refreshing them.

lisp/ChangeLog

+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)

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