* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore dir-locals.

Fixes: debbugs:12357

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ccc3f7efa107f19b0386b662379d58d0d58f619..04af3ca01a515491e4d2d8dc7d59cf6df2400a52 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-06  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/shadow.el (load-path-shadows-find):
+       Ignore dir-locals.  (Bug#12357)
+
 2014-03-05  Glenn Morris  <rgm@gnu.org>
 
        * files.el (interpreter-mode-alist):

diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index aba929035d1dc6a1026894d5d3ab61cb2fcd4005..e8b4eb39576de5200b476a6880e137671812c692 100644 (file)
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -115,7 +115,9 @@ See the documentation for `list-load-path-shadows' for further information."
          ;; FILE now contains the current file name, with no suffix.
          (unless (or (member file files-seen-this-dir)
                      ;; Ignore these files.
-                     (member file '("subdirs" "leim-list")))
+                     (member file (list "subdirs" "leim-list"
+                                        (file-name-sans-extension
+                                         dir-locals-file))))
            ;; File has not been seen yet in this directory.
            ;; This test prevents us declaring that XXX.el shadows
            ;; XXX.elc (or vice-versa) when they are in the same directory.