diff options
author | Andreas Schwab <schwab@linux-m68k.org> | 2011-01-29 10:44:40 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@linux-m68k.org> | 2011-01-29 10:44:40 +0100 |
commit | d3b3388ff002261f370d0cc1ad0c4e2445d99394 (patch) | |
tree | bb009930772301a1d399472776d4e4f05e7ed4db | |
parent | 9ca9a306b5f173ca9879333f920ed0ffdebde531 (diff) | |
download | emacs-d3b3388ff002261f370d0cc1ad0c4e2445d99394.tar.gz |
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/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/emacs-lisp/shadow.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bd7bc89d1b..f0a37ebaeb9 100644 --- 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 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." ;; 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. |