* emacs-lisp/bytecomp.el (byte-recompile-directory): Ignore dir-locals-file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdc7a9b85c962898710202417845579873a32fbe..78f6429b181950d4f875bc936eddd02cf69f6a84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-08  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/bytecomp.el (byte-recompile-directory):
+       Ignore dir-locals-file.
+
 2010-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist):

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c42292a27879294c47d9011706b0e8e0317af684..b1aa4a32b2598efecafde77a3c9584ee7bd77c08 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -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 <jwz@lucid.com>
 ;;     Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -1548,6 +1549,9 @@ that already has a `.elc' file."
               (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)