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

* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore dir-locals.

Browse source 
Fixes: debbugs:12357
This commit is contained in:
Glenn Morris 2014-03-05 21:01:02 -05:00
parent 4da3a85d6c
commit c94e6ee499
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-03-06 Glenn Morris <rgm@gnu.org>
* emacs-lisp/shadow.el (load-path-shadows-find):
Ignore dir-locals. (Bug#12357)
2014-03-05 Glenn Morris <rgm@gnu.org>
* files.el (interpreter-mode-alist):

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

@ -115,7 +115,9 @@ 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" "leim-list")))
(member file (list "subdirs" "leim-list"
(file-name-sans-extension
dir-locals-file))))
;; 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.