From 13639aab35819fbbe0d414e57b955d49c7affd86 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Sep 2010 08:59:10 -0700 Subject: [PATCH] * emacs-lisp/bytecomp.el (byte-recompile-directory): Ignore dir-locals-file. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/bytecomp.el | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fdc7a9b85c9..78f6429b181 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-08 Glenn Morris + + * emacs-lisp/bytecomp.el (byte-recompile-directory): + Ignore dir-locals-file. + 2010-09-08 Stefan Monnier * progmodes/compile.el (compilation-error-regexp-alist-alist): diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index c42292a2787..b1aa4a32b25 100644 --- 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 ;; Hallvard Furuseth @@ -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) -- 2.39.2