Don't complain about duplicate leim-list files

* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d71c51f..ee4eae0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
+       files.
+
 2011-01-28  Chong Yidong  <cyd@stupidchicken.com>
 
        * image-dired.el (image-dired-mouse-display-image): No-op if no

diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index f5fe68e..61daa21 100644 (file)
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -116,7 +116,7 @@ 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")))
+                     (member file '("subdirs" "leim-list")))
            ;; 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.