diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-03-05 21:01:02 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-03-05 21:01:02 -0500 |
| commit | c94e6ee4993d2c8f676d1a46ef6a16796ebd064d (patch) | |
| tree | 3183c68edc17af6f24d8980175d83bff8296b0d1 /lisp/emacs-lisp | |
| parent | 4da3a85d6c2e9902f5964bff2d5c5ce02b4ba462 (diff) | |
| download | emacs-c94e6ee4993d2c8f676d1a46ef6a16796ebd064d.tar.gz | |
* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore dir-locals.
Fixes: debbugs:12357
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index aba929035d1..e8b4eb39576 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -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. |