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

Fix remote directories in Eshell on MS-Windows

Browse source 
* lisp/files.el (cd): Support remote directory names on
MS-Windows.  (Bug#33791)
This commit is contained in:
Eli Zaretskii 2018-12-29 10:15:50 +02:00
parent 822a2d039f
commit 7a60a4f449
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/files.el
View file

@ -801,9 +801,16 @@ The path separator is colon in GNU and GNU-like systems."
(setq cd-path (or (parse-colon-path (getenv "CDPATH")) (setq cd-path (or (parse-colon-path (getenv "CDPATH"))
(list "./")))) (list "./"))))
(cd-absolute (cd-absolute
(or (locate-file dir cd-path nil (or
(lambda (f) (and (file-directory-p f) 'dir-ok))) ;; locate-file doesn't support remote file names, so detect them
(error "No such directory found via CDPATH environment variable")))) ;; and support them here by hand.
(and (file-remote-p (expand-file-name dir))
(file-name-absolute-p (expand-file-name dir))
(file-accessible-directory-p (expand-file-name dir))
(expand-file-name dir))
(locate-file dir cd-path nil
(lambda (f) (and (file-directory-p f) 'dir-ok)))
(error "No such directory found via CDPATH environment variable"))))
(defun directory-files-recursively (dir regexp &optional include-directories) (defun directory-files-recursively (dir regexp &optional include-directories)
"Return list of all files under DIR that have file names matching REGEXP. "Return list of all files under DIR that have file names matching REGEXP.