bug#11795: 24.1.50; wdired: C-c C-c loses marks and positions of renamed files

[Michael Heerdegen]

Hi Christopher,

the patch indeed fixes the problem, thanks!

But there is a problem: if I now rename a file that isn't marked, I get the
following error:

Debugger entered--Lisp error: (wrong-type-argument char-or-string-p nil)
  dired-mark-remembered((("/home/micha/Treasure/Trash/bug")))
  (let ((inhibit-read-only t)) (dired-mark-remembered marks))
  (progn (when (and (stringp dired-directory) (not (file-directory-p 
dired-directory)) (null some-file-names-unchanged) (= (length files-renamed) 
1)) (setq dired-directory (cdr (car files-renamed)))) (revert-buffer) (let 
((inhibit-read-only t)) (dired-mark-remembered marks)))
  (if changes (progn (when (and (stringp dired-directory) (not 
(file-directory-p dired-directory)) (null some-file-names-unchanged) (= (length 
files-renamed) 1)) (setq dired-directory (cdr (car files-renamed)))) 
(revert-buffer) (let ((inhibit-read-only t)) (dired-mark-remembered marks))) 
(let ((inhibit-read-only t)) (remove-text-properties (point-min) (point-max) 
(quote (old-name nil end-name nil old-link nil end-link nil end-perm nil 
old-perm nil perm-changed nil))) (message "(No changes to be performed)")))
  (let ((changes nil) (errors 0) (marks (dired-remember-marks (point-min) 
(point-max))) files-deleted files-renamed some-file-names-unchanged file-old 
file-new tmp-value) (save-excursion (when (and wdired-allow-to-redirect-links 
(fboundp (quote make-symbolic-link))) (setq tmp-value 
(wdired-do-symlink-changes)) (setq errors (cdr tmp-value)) (setq changes (car 
tmp-value))) (when (and wdired-allow-to-change-permissions (boundp (quote 
wdired-col-perm))) (setq tmp-value (wdired-do-perm-changes)) (setq errors (+ 
errors (cdr tmp-value))) (setq changes (or changes (car tmp-value)))) 
(goto-char (point-max)) (while (not (bobp)) (setq file-old (wdired-get-filename 
nil t)) (when file-old (setq file-new (wdired-get-filename)) (if (equal 
file-new file-old) (setq some-file-names-unchanged t) (setq changes t) (if (not 
file-new) (push file-old files-deleted) (when dired-keep-marker-rename (push 
... marks)) (push (cons file-old ...) files-renamed)))) (forward-line -1))) 
(when files-renamed (setq errors (+ errors (wdired-do-renames files-renamed)))) 
(if changes (progn (when (and (stringp dired-directory) (not (file-directory-p 
dired-directory)) (null some-file-names-unchanged) (= (length files-renamed) 
1)) (setq dired-directory (cdr (car files-renamed)))) (revert-buffer) (let 
((inhibit-read-only t)) (dired-mark-remembered marks))) (let 
((inhibit-read-only t)) (remove-text-properties (point-min) (point-max) (quote 
(old-name nil end-name nil old-link nil end-link nil end-perm nil old-perm nil 
perm-changed nil))) (message "(No changes to be performed)"))) (when 
files-deleted (wdired-flag-for-deletion files-deleted)) (when (> errors 0) 
(dired-log-summary (format "%d rename actions failed" errors) nil)))
  wdired-finish-edit()
  call-interactively(wdired-finish-edit nil nil)

`dired-mark-remembered' does not accept files that are not marked, see
the docstring.  I guess this can easily be fixed by just removing those
from the alist before calling `dired-mark-remembered'.


Regards,

Michael.


> diff --git a/wdired.el b/wdired-fixed.el
> index fe5b4ef..c5956c5 100644
> --- a/wdired.el
> +++ b/wdired-fixed.el
> @@ -351,6 +351,7 @@ non-nil means return old filename."
>    (wdired-change-to-dired-mode)
>    (let ((changes nil)
>       (errors 0)
> +     (marks (dired-remember-marks (point-min) (point-max)))
>       files-deleted
>       files-renamed
>       some-file-names-unchanged
> @@ -376,6 +377,12 @@ non-nil means return old filename."
>              (setq changes t)
>              (if (not file-new)               ;empty filename!
>                  (push file-old files-deleted)
> +           (when dired-keep-marker-rename
> +             (push (cons (substitute-in-file-name file-new)
> +                         (if (integerp dired-keep-marker-rename)
> +                             dired-keep-marker-rename
> +                           (cdr (assoc file-old marks))))
> +                   marks))
>                (push (cons file-old (substitute-in-file-name file-new))
>                      files-renamed))))
>       (forward-line -1)))
> @@ -393,7 +400,9 @@ non-nil means return old filename."
>                    (= (length files-renamed) 1))
>           (setq dired-directory (cdr (car files-renamed))))
>         ;; Re-sort the buffer.
> -       (revert-buffer))
> +       (revert-buffer)
> +       (let ((inhibit-read-only t))
> +         (dired-mark-remembered marks)))
>        (let ((inhibit-read-only t))
>       (remove-text-properties (point-min) (point-max)
>                               '(old-name nil end-name nil old-link nil
>
>
>         Christopher