Mercurial > emacs
changeset 110267:bd6932be9441
* emacs-lisp/bytecomp.el (byte-recompile-directory): Ignore dir-locals-file.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 08 Sep 2010 08:59:10 -0700 |
| parents | 5086e18330fb |
| children | b2cc1d56be0f |
| files | lisp/ChangeLog lisp/emacs-lisp/bytecomp.el |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 08 17:53:08 2010 +0200 +++ b/lisp/ChangeLog Wed Sep 08 08:59:10 2010 -0700 @@ -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):
--- a/lisp/emacs-lisp/bytecomp.el Wed Sep 08 17:53:08 2010 +0200 +++ b/lisp/emacs-lisp/bytecomp.el Wed Sep 08 08:59:10 2010 -0700 @@ -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 @@ (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)