diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2016-01-16 09:21:27 +0000 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2016-01-16 09:24:08 +0000 |
| commit | 6165c3649a537da8fe6e883de4823f01d6394dc0 (patch) | |
| tree | dd2af57a7565b55b3eb6e3b4b89d1fc571b4ae92 | |
| parent | 2ffdf155ee618ec132175e3337b4c06d157d8bd6 (diff) | |
| download | emacs-6165c3649a537da8fe6e883de4823f01d6394dc0.tar.gz | |
* lisp/files.el (dir-locals--all-files): Respect absolute file-names
| -rw-r--r-- | lisp/files.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/files.el b/lisp/files.el index 7c6119b7ef9..5a15c71aab6 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3732,8 +3732,9 @@ The returned list is sorted by `string<' order." (require 'seq) (let ((dir (if (file-directory-p file-or-dir) file-or-dir - default-directory)) - (file (cond ((not (file-directory-p file-or-dir)) file-or-dir) + (or (file-name-directory file-or-dir) + default-directory))) + (file (cond ((not (file-directory-p file-or-dir)) (file-name-nondirectory file-or-dir)) ((eq system-type 'ms-dos) (dosified-file-name dir-locals-file)) (t dir-locals-file)))) (seq-filter (lambda (f) (and (file-readable-p f) |