Commit 02bf7cc4 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

Properly handle unquoting in wdired (bug 22938)

The recorded old names are not quoted, don't unquote them.

* lisp/wdired.el (wdired-normalize-filename): Add argument
unquotep, only unquote if non-nil.
(wdired-get-filename): Don't unquote the old file name.
(wdired-get-previous-link): Always unquote.
parent 16cf469d
...@@ -294,14 +294,15 @@ or \\[wdired-abort-changes] to abort changes"))) ...@@ -294,14 +294,15 @@ or \\[wdired-abort-changes] to abort changes")))
(put-text-property b-protection (point-max) 'read-only t)))) (put-text-property b-protection (point-max) 'read-only t))))
;; This code is a copy of some dired-get-filename lines. ;; This code is a copy of some dired-get-filename lines.
(defsubst wdired-normalize-filename (file) (defsubst wdired-normalize-filename (file unquotep)
(setq file (when unquotep
;; FIXME: shouldn't we check for a `b' argument or somesuch before (setq file
;; doing such unquoting? --Stef ;; FIXME: shouldn't we check for a `b' argument or somesuch before
(read (concat ;; doing such unquoting? --Stef
"\"" (replace-regexp-in-string (read (concat
"\\([^\\]\\|\\`\\)\"" "\\1\\\\\"" file) "\"" (replace-regexp-in-string
"\""))) "\\([^\\]\\|\\`\\)\"" "\\1\\\\\"" file)
"\""))))
(and file buffer-file-coding-system (and file buffer-file-coding-system
(not file-name-coding-system) (not file-name-coding-system)
(not default-file-name-coding-system) (not default-file-name-coding-system)
...@@ -329,7 +330,8 @@ non-nil means return old filename." ...@@ -329,7 +330,8 @@ non-nil means return old filename."
;; deletion. ;; deletion.
(setq end (next-single-property-change beg 'end-name)) (setq end (next-single-property-change beg 'end-name))
(setq file (buffer-substring-no-properties (1+ beg) end))) (setq file (buffer-substring-no-properties (1+ beg) end)))
(and file (setq file (wdired-normalize-filename file)))) ;; Don't unquote the old name, it wasn't quoted in the first place
(and file (setq file (wdired-normalize-filename file (not old)))))
(if (or no-dir old) (if (or no-dir old)
file file
(and file (> (length file) 0) (and file (> (length file) 0)
...@@ -627,7 +629,7 @@ If OLD, return the old target. If MOVE, move point before it." ...@@ -627,7 +629,7 @@ If OLD, return the old target. If MOVE, move point before it."
(setq end (next-single-property-change beg 'end-link)) (setq end (next-single-property-change beg 'end-link))
(setq target (buffer-substring-no-properties (1+ beg) end))) (setq target (buffer-substring-no-properties (1+ beg) end)))
(if move (goto-char (1- beg))))) (if move (goto-char (1- beg)))))
(and target (wdired-normalize-filename target)))) (and target (wdired-normalize-filename target t))))
(declare-function make-symbolic-link "fileio.c") (declare-function make-symbolic-link "fileio.c")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment