diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-11 21:27:53 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-11 21:27:53 -0500 |
| commit | c530e1c2a3a036d71942c354ba11b30a06341fd7 (patch) | |
| tree | 184fa6b6c9bb58855aa9f1ae6cded97edc4f10fb /lisp/emacs-lisp/shadow.el | |
| parent | 295fb2ac59b66c0e2470325a42c8e58c135ed044 (diff) | |
| parent | e0e36cac4adaa32ad755a34c811366dd8e4655bc (diff) | |
| download | emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.tar.gz emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.tar.bz2 emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.zip | |
Merge from trunk
Diffstat (limited to 'lisp/emacs-lisp/shadow.el')
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index c5bad3bd40f..d5bba20b1cd 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -115,7 +115,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. |