diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ccc3f7efa1..04af3ca01a5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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): 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. |