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

Fix Wdired with relative and abbreviated file names

Browse source 
* lisp/wdired.el (wdired-finish-edit): Support Dired buffers where
'dired-directory' is a list made of relative or abbreviated file
names.  (Bug#64606)
This commit is contained in:
Eli Zaretskii 2023-07-16 12:15:24 +03:00
parent c5fa58cbc4
commit a65ece8b20
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lisp/wdired.el
View file

@ -556,8 +556,24 @@ non-nil means return old filename."
;; been modified with their new name keeping
;; the ones that are unmodified at the same place.
(cl-loop for f in (cdr dired-directory)
collect (or (assoc-default f files-renamed)
f))))))
collect
(or (assoc-default f files-renamed)
;; F could be relative or
;; abbreviated, whereas
;; files-renamed always consists
;; of absolute file names.
(let ((relative
(not (file-name-absolute-p f)))
(match
(assoc-default (expand-file-name f)
files-renamed)))
(cond
;; If it was relative, convert
;; the new name back to relative.
((and match relative)
(file-relative-name match))
(t match)))
f))))))
;; Re-sort the buffer.
(revert-buffer)
(let ((inhibit-read-only t))