[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100431: Don't complain about duplicate leim-list files

[Andreas Schwab]

------------------------------------------------------------
revno: 100431
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2011-01-29 10:44:40 +0100
message:
  Don't complain about duplicate leim-list files
  
  * lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
  files.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/shadow.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-28 18:09:59 +0000
+++ b/lisp/ChangeLog    2011-01-29 09:44:40 +0000
@@ -1,3 +1,8 @@
+2011-01-29  Andreas Schwab  <address@hidden>
+
+       * emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
+       files.
+
 2011-01-28  Chong Yidong  <address@hidden>
 
        * image-dired.el (image-dired-mouse-display-image): No-op if no

=== modified file 'lisp/emacs-lisp/shadow.el'
--- a/lisp/emacs-lisp/shadow.el 2011-01-02 23:50:46 +0000
+++ b/lisp/emacs-lisp/shadow.el 2011-01-29 09:44:40 +0000
@@ -116,7 +116,7 @@
          ;; 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.