[Emacs-diffs] /srv/bzr/emacs/trunk r101384: * emacs-lisp/bytecomp.el (byte-recompile-directory): Ignore dir-locals-file.

[Glenn Morris]

------------------------------------------------------------
revno: 101384
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-09-08 08:59:10 -0700
message:
  * emacs-lisp/bytecomp.el (byte-recompile-directory): Ignore dir-locals-file.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-08 15:53:08 +0000
+++ b/lisp/ChangeLog    2010-09-08 15:59:10 +0000
@@ -1,3 +1,8 @@
+2010-09-08  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/bytecomp.el (byte-recompile-directory):
+       Ignore dir-locals-file.
+
 2010-09-08  Stefan Monnier  <address@hidden>
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist):

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2010-08-29 16:17:13 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2010-09-08 15:59:10 +0000
@@ -1,7 +1,8 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 
Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <address@hidden>
 ;;     Hallvard Furuseth <address@hidden>
@@ -1548,6 +1549,9 @@
               (if (and (string-match emacs-lisp-file-regexp bytecomp-source)
                        (file-readable-p bytecomp-source)
                        (not (auto-save-file-name-p bytecomp-source))
+                       (not (string-equal dir-locals-file
+                                          (file-name-nondirectory
+                                           bytecomp-source)))
                        (setq bytecomp-dest
                               (byte-compile-dest-file bytecomp-source))
                        (if (file-exists-p bytecomp-dest)