* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for

lexical-binding.

Fixes: debbugs:12938

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be04ad733f092f76059b9792429b5b5f41d70a91..431f45c36957e432b210170cb6a6fdf66f33ea47 100644 (file)
--- 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 7534ce5eaca835b1fd26da13253e6214ebaff947..df6a79d5196d2296da6b6dc058470148abe8c98a 100644 (file)
--- 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