Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c94e6ee4
Commit
c94e6ee4
authored
Mar 05, 2014
by
Glenn Morris
Browse files
* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Ignore dir-locals.
Fixes: debbugs:12357
parent
4da3a85d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/emacs-lisp/shadow.el
lisp/emacs-lisp/shadow.el
+3
-1
No files found.
lisp/ChangeLog
View file @
c94e6ee4
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):
...
...
lisp/emacs-lisp/shadow.el
View file @
c94e6ee4
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment