diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2022-10-06 22:18:21 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2022-10-06 22:18:21 +0200 |
| commit | 87301f262357c8003fe1a02b58bfcc9dc9d82a14 (patch) | |
| tree | dad4172a6c2f33c86a487337403043dab0f180d3 /lisp/dired.el | |
| parent | 8c8a54dd23c90f108f340f015e8cd91ccdb9cc94 (diff) | |
| download | emacs-87301f262357c8003fe1a02b58bfcc9dc9d82a14.tar.gz | |
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)
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 6 |
1 files changed, 1 insertions, 5 deletions
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)) |