From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 6 Oct 2022 20:18:21 +0000 (+0200)
Subject: Better support for remote file names in dired
X-Git-Tag: emacs-29.0.90~1616^2~726
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87301f262357c8003fe1a02b58bfcc9dc9d82a14;p=emacs.git

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)
---

diff --git a/lisp/dired.el b/lisp/dired.el
index 96b580d5763..f9a77431393 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -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))