procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of UNCs in 'parse-colon-path

Browse source 
* lisp/files.el (parse-colon-path): Don't remove the second
leading slash on systems that support UNCs.  (Bug#57353)

* test/lisp/files-tests.el (files-tests-bug-21454): Update
expected results.
(files-colon-path): Add a new test pattern.
This commit is contained in:
Eli Zaretskii 2022-08-24 19:19:33 +03:00
parent 3835255a38
commit 95b1eacd47
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/files.el
View file

@ -851,15 +851,20 @@ resulting list of directory names. For an empty path element (i.e.,
a leading or trailing separator, or two adjacent separators), return
nil (meaning `default-directory') as the associated list element."
(when (stringp search-path)
(let ((spath (substitute-env-vars search-path)))
(let ((spath (substitute-env-vars search-path))
(double-slash-special-p
(memq system-type '(windows-nt cygwin ms-dos))))
(mapcar (lambda (f)
(if (equal "" f) nil
(let ((dir (file-name-as-directory f)))
;; Previous implementation used `substitute-in-file-name'
;; which collapse multiple "/" in front. Do the same for
;; backward compatibility.
(if (string-match "\\`/+" dir)
(substring dir (1- (match-end 0))) dir))))
;; which collapses multiple "/" in front, while
;; preserving double slash where it matters. Do
;; the same for backward compatibility.
(if (string-match "\\`//+" dir)
(substring dir (- (match-end 0)
(if double-slash-special-p 2 1)))
dir))))
(split-string spath path-separator)))))
(defun cd-absolute (dir)

10
test/lisp/files-tests.el
View file

@ -221,8 +221,8 @@ form.")
("x:/foo//bar/" "y:/bar/qux/" "z:/qux/foo/"))
("x:/foo/bar" "$FOO/baz/;z:/qux/foo/"
("x:/foo/bar/baz/" "z:/qux/foo/"))
("//foo/bar/" "$FOO/baz/;/qux/foo/"
("/foo/bar//baz/" "/qux/foo/")))
("///foo/bar/" "$FOO/baz/;/qux/foo/"
("//foo/bar//baz/" "/qux/foo/")))
'(("/foo/bar//baz/:/bar/foo/baz//" nil
("/foo/bar//baz/" "/bar/foo/baz//"))
("/foo/bar/:/bar/qux/:/qux/foo" nil
@ -1504,7 +1504,11 @@ See <https://debbugs.gnu.org/36401>."
(should (equal (parse-colon-path "/foo//bar/baz")
'("/foo//bar/baz/"))))
(should (equal (parse-colon-path (concat "." path-separator "/tmp"))
'("./" "/tmp/"))))
'("./" "/tmp/")))
(should (equal (parse-colon-path (concat "/foo" path-separator "///bar"))
(if (memq system-type '(windows-nt cygwin ms-dos))
'("/foo/" "//bar/")
'("/foo/" "/bar/")))))
(ert-deftest files-test-magic-mode-alist-doctype ()
"Test that DOCTYPE and variants put files in mhtml-mode."