summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-11-23 16:49:13 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2012-11-23 16:49:13 -0500
commit002c019c34eeb1cad4ce8f5ae721b1cdf22f0946 (patch)
tree1db14c2e01e8abf554347b8fbbad43a72c2df48b
parent977f932513ce1d8ee73eafb73e39d51774021fab (diff)
downloademacs-002c019c34eeb1cad4ce8f5ae721b1cdf22f0946.tar.gz
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for
lexical-binding. Fixes: debbugs:12938
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/emacs-lisp/bytecomp.el3
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be04ad733f0..431f45c3695 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for
+ lexical-binding (bug#12938).
+
2012-11-23 Wolfgang Jenkner <wjenkner@inode.at>
* image-mode.el (image-transform-check-size): Use assertions only
@@ -43,14 +48,14 @@
(c-debug-parse-state): Call the above new function.
(c-toggle-parse-state-debug): Output a confirmatory message.
- * progmodes/cc-mode.el (c-before-change, c-after-change): Call
- c-invalidate-state-cache from `c-before-change' instead of
+ * progmodes/cc-mode.el (c-before-change, c-after-change):
+ Call c-invalidate-state-cache from `c-before-change' instead of
`c-after-change'.
2012-11-20 Daniel Colascione <dancol@dancol.org>
- * term/w32-win.el (cygwin-convert-path-from-windows): Accomodate
- rename of cygwin_convert_path* to cygwin_convert_file_name*.
+ * term/w32-win.el (cygwin-convert-path-from-windows):
+ Accomodate rename of cygwin_convert_path* to cygwin_convert_file_name*.
This change is a backport from trunk.
2012-11-20 Eli Zaretskii <eliz@gnu.org>
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 7534ce5eaca..df6a79d5196 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1745,6 +1745,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