[Emacs-diffs] emacs-25 6165c36 2/2: * lisp/files.el (dir-locals--all-files): Respect absolute file-names

[Artur Malabarba]

branch: emacs-25
commit 6165c3649a537da8fe6e883de4823f01d6394dc0
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    * lisp/files.el (dir-locals--all-files): Respect absolute file-names
---
 lisp/files.el |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 7c6119b..5a15c71 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)