[Emacs-diffs] master b9373ac: Fix file-in-directory-p when the directory is UNC

[Eli Zaretskii]

branch: master
commit b9373ac26ad75fe38638a51eea54944163cc1c38
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix file-in-directory-p when the directory is UNC
    
    * lisp/files.el (file-in-directory-p): Support files and
    directories that begin with "//".  (Bug#20844)
---
 lisp/files.el |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 4656ada..540d613 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5279,7 +5279,12 @@ Return nil if DIR is not an existing directory."
              dir  (file-truename dir))
        (let ((ls1 (split-string file "/" t))
              (ls2 (split-string dir  "/" t))
-             (root (if (string-match "\\`/" file) "/" ""))
+             (root
+               (cond
+                ;; A UNC on Windows systems, or a "super-root" on Apollo.
+                ((string-match "\\`//" file) "//")
+                ((string-match "\\`/" file) "/")
+                (t "")))
              (mismatch nil))
          (while (and ls1 ls2 (not mismatch))
            (if (string-equal (car ls1) (car ls2))