master ed15f39: Ignore .dir-locals-2.el files more

[Lars Ingebrigtsen]

branch: master
commit ed15f3954c04e2039a565ca0d0ff810519da8197
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Ignore .dir-locals-2.el files more
    
    * lisp/emacs-lisp/shadow.el (load-path-shadows-find):
    * lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Ignore
    .dir-locals-2.el, too (bug#23257).
---
 lisp/emacs-lisp/bytecomp.el | 3 +--
 lisp/emacs-lisp/shadow.el   | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 3e65db4..7099964 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1857,8 +1857,7 @@ also be compiled."
                         (file-readable-p source)
                        (not (string-match "\\`\\.#" file))
                         (not (auto-save-file-name-p source))
-                        (not (string-equal dir-locals-file
-                                           (file-name-nondirectory source))))
+                        (not (member source (dir-locals--all-files 
directory))))
                    (progn (cl-incf
                            (pcase (byte-recompile-file source force arg)
                              ('no-byte-compile skip-count)
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index c1d0594..02f2ad3 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -115,9 +115,12 @@ 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 (list "subdirs" "leim-list"
-                                        (file-name-sans-extension
-                                         dir-locals-file))))
+                     (member file
+                              (list "subdirs" "leim-list"
+                                   (file-name-sans-extension dir-locals-file)
+                                    (concat
+                                    (file-name-sans-extension dir-locals-file)
+                                     "-2"))))
            ;; 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.