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

* lisp/dired.el (dired-make-relative): Make change less aggressive.

Browse source
This commit is contained in:
Michael Albinus 2022-10-07 13:14:46 +02:00
parent 6edb676c18
commit 17d0f61c80
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/dired.el
View file

@ -2953,7 +2953,11 @@ 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."
(setq dir (expand-file-name (or dir default-directory)))
(or dir (setq dir default-directory))
;; This case comes into play if default-directory is set to
;; use ~.
(if (string-match-p "\\(\\`\\|:\\)~" dir)
(setq dir (expand-file-name dir)))
(if (string-match (concat "^" (regexp-quote dir)) file)
(substring file (match-end 0))
file))