aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2011-01-29 10:44:40 +0100
committerAndreas Schwab2011-01-29 10:44:40 +0100
commite935c6a287abf3dc87e2bc79d9019460a689d4aa (patch)
treef93f352988f9dd6a4e50730ea6e6538021d19428
parent61db307fee9a511cb38cfaffbedbfbf163aa6256 (diff)
downloademacs-e935c6a287abf3dc87e2bc79d9019460a689d4aa.tar.gz
emacs-e935c6a287abf3dc87e2bc79d9019460a689d4aa.zip
Don't complain about duplicate leim-list files
* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list files.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/shadow.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d71c51f5bde..ee4eae0e41b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-01-29 Andreas Schwab <schwab@linux-m68k.org>
2
3 * emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
4 files.
5
12011-01-28 Chong Yidong <cyd@stupidchicken.com> 62011-01-28 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * image-dired.el (image-dired-mouse-display-image): No-op if no 8 * 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 f5fe68e8e4d..61daa21fcfa 100644
--- 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."
116 ;; FILE now contains the current file name, with no suffix. 116 ;; FILE now contains the current file name, with no suffix.
117 (unless (or (member file files-seen-this-dir) 117 (unless (or (member file files-seen-this-dir)
118 ;; Ignore these files. 118 ;; Ignore these files.
119 (member file '("subdirs"))) 119 (member file '("subdirs" "leim-list")))
120 ;; File has not been seen yet in this directory. 120 ;; File has not been seen yet in this directory.
121 ;; This test prevents us declaring that XXX.el shadows 121 ;; This test prevents us declaring that XXX.el shadows
122 ;; XXX.elc (or vice-versa) when they are in the same directory. 122 ;; XXX.elc (or vice-versa) when they are in the same directory.