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 | e935c6a287abf3dc87e2bc79d9019460a689d4aa (patch) | |
| tree | f93f352988f9dd6a4e50730ea6e6538021d19428 | |
| parent | 61db307fee9a511cb38cfaffbedbfbf163aa6256 (diff) | |
| download | emacs-e935c6a287abf3dc87e2bc79d9019460a689d4aa.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 d71c51f5bde..ee4eae0e41b 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. |