summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-11-23 17:57:09 -0800
committerGlenn Morris <rgm@gnu.org>2012-11-23 17:57:09 -0800
commitd125ca15f3751f36a1ec49e3d9f9de1735b43698 (patch)
tree5d2764d6a135cdd7d664c8c43f915a14932cd94c /lisp/emacs-lisp
parent678a34f4f8e93b8c43e5cdfba423189f4767e5c5 (diff)
parent6d4e8f62e93b575a1da2cd2b4abeb9dce56e1e52 (diff)
downloademacs-d125ca15f3751f36a1ec49e3d9f9de1735b43698.tar.gz
emacs-d125ca15f3751f36a1ec49e3d9f9de1735b43698.tar.bz2
emacs-d125ca15f3751f36a1ec49e3d9f9de1735b43698.zip
Merge from emacs-24; up to 2012-11-19T11:36:02Z!yamaoka@jpl.org
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/bytecomp.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 60036c86dc0..5867cfb7064 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1748,6 +1748,9 @@ The value is non-nil if there were no errors, nil if errors."
;; There may be a file local variable setting (bug#10419).
(setq buffer-read-only nil
filename buffer-file-name))
+ ;; Don't inherit lexical-binding from caller (bug#12938).
+ (unless (local-variable-p 'lexical-binding)
+ (setq-local lexical-binding nil))
;; Set the default directory, in case an eval-when-compile uses it.
(setq default-directory (file-name-directory filename)))
;; Check if the file's local variables explicitly specify not to