diff options
| -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 d71c51f5bd..ee4eae0e41 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-29 Andreas Schwab <[email protected]> + + * emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list + files. + 2011-01-28 Chong Yidong <[email protected]> * 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 f5fe68e8e4..61daa21fcf 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. |