diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-18 08:56:10 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-18 08:56:10 -0400 |
| commit | 90eacf9920c2d9dc4edffdefe7e7a2a781493cc2 (patch) | |
| tree | ba5b10cc2c0e5af4f5017c44c9c12f268516d1e9 /lisp/emacs-lisp | |
| parent | b2f0135a62c6242ad8b865d37d65bb817f8d1262 (diff) | |
| download | emacs-90eacf9920c2d9dc4edffdefe7e7a2a781493cc2.tar.gz emacs-90eacf9920c2d9dc4edffdefe7e7a2a781493cc2.tar.bz2 emacs-90eacf9920c2d9dc4edffdefe7e7a2a781493cc2.zip | |
* lisp/emacs-lisp/gv.el (cond): Same fix as before for `if'.
* Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/gv.el | 3 |
1 files changed, 2 insertions, 1 deletions
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 |