From 55eb8c37eeabf11f9fc1ec1f84c64fc234ecf59f Mon Sep 17 00:00:00 2001 From: Richard Copley Date: Tue, 23 Aug 2022 12:11:20 +0100 Subject: [PATCH] Fix parse-colon-path with UNC directory names * lisp/files.el (parse-colon-path): don't collapse multiple / at beginning of path component --- lisp/files.el | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index cf2a522193..569fd0224e 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -853,13 +853,8 @@ nil (meaning `default-directory') as the associated list element." (when (stringp search-path) (let ((spath (substitute-env-vars search-path))) (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)))) + (unless (equal "" f) + (file-name-as-directory f))) (split-string spath path-separator))))) (defun cd-absolute (dir) -- 2.37.0.windows.1