Skip to content

Commit

Permalink
Don't complain about duplicate leim-list files
Browse files Browse the repository at this point in the history
* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
files.
  • Loading branch information
andreas-schwab committed Jan 29, 2011
1 parent 9ca9a30 commit d3b3388
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/emacs-lisp/shadow.el
Expand Up @@ -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.
Expand Down

0 comments on commit d3b3388

Please sign in to comment.