Better support for remote file names in dired

* lisp/dired.el (dired-make-relative): Expand DIR anyway, because
it could also be an abbreviated remote file name.  (Bug#58300)
This commit is contained in:
Michael Albinus 2022-10-06 22:18:21 +02:00
parent 8c8a54dd23
commit 87301f2623

View file

@ -2953,11 +2953,7 @@ Optional arg GLOBAL means to replace all matches."
If DIR is omitted or nil, it defaults to `default-directory'.
If FILE is not in the directory tree of DIR, return FILE
unchanged."
(or dir (setq dir default-directory))
;; This case comes into play if default-directory is set to
;; use ~.
(if (and (> (length dir) 0) (= (aref dir 0) ?~))
(setq dir (expand-file-name dir)))
(setq dir (expand-file-name (or dir default-directory)))
(if (string-match (concat "^" (regexp-quote dir)) file)
(substring file (match-end 0))
file))