procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from emacs-23 branch

Browse source
This commit is contained in:
Chong Yidong 2011-01-31 18:54:50 -05:00
commit 14beddf471
26 changed files with 414 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/shadow.el
View file

@ -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.