[Emacs-diffs] trunk r116681: * lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore dir-locals.

[Glenn Morris]

------------------------------------------------------------
revno: 116681
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/12357
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-03-05 21:01:02 -0500
message:
  * lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore dir-locals.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/shadow.el      shadow.el-20091113204419-o5vbwnq5f7feedwu-959

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-05 18:58:16 +0000
+++ b/lisp/ChangeLog    2014-03-06 02:01:02 +0000
@@ -1,3 +1,8 @@
+2014-03-06  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/shadow.el (load-path-shadows-find):
+       Ignore dir-locals.  (Bug#12357)
+
 2014-03-05  Glenn Morris  <address@hidden>
 
        * files.el (interpreter-mode-alist):

=== modified file 'lisp/emacs-lisp/shadow.el'
--- a/lisp/emacs-lisp/shadow.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/shadow.el 2014-03-06 02:01:02 +0000
@@ -115,7 +115,9 @@
          ;; 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.