[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110945: * lisp/emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for

[Stefan Monnier]

------------------------------------------------------------
revno: 110945
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12938
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-11-23 16:49:13 -0500
message:
  * lisp/emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for
  lexical-binding.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-23 17:41:01 +0000
+++ b/lisp/ChangeLog    2012-11-23 21:49:13 +0000
@@ -1,3 +1,8 @@
+2012-11-23  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for
+       lexical-binding (bug#12938).
+
 2012-11-23  Wolfgang Jenkner  <address@hidden>
 
        * 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  <address@hidden>
 
-       * 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  <address@hidden>

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2012-10-11 20:08:38 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2012-11-23 21:49:13 +0000
@@ -1745,6 +1745,9 @@
         ;; 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