[Emacs-diffs] /srv/bzr/emacs/trunk r110564: When renaming a file with wdired move point with file and don't lose mark status (Bug#11795).

[martin rudalics]

------------------------------------------------------------
revno: 110564
author: Michael Heerdegen <address@hidden>
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-17 11:11:49 +0200
message:
  When renaming a file with wdired move point with file and don't lose mark 
status (Bug#11795).
  
  * wdired.el (wdired-old-marks): New variable.
  (wdired-change-to-wdired-mode): Locally set wdired-old-marks.
  (wdired-do-renames): Move point with renamed file and don't lose
  mark status (Bug#11795).
modified:
  lisp/ChangeLog
  lisp/wdired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-16 23:27:40 +0000
+++ b/lisp/ChangeLog    2012-10-17 09:11:49 +0000
@@ -1,3 +1,10 @@
+2012-10-17  Michael Heerdegen <address@hidden>  (tiny change)
+
+       * wdired.el (wdired-old-marks): New variable.
+       (wdired-change-to-wdired-mode): Locally set wdired-old-marks.
+       (wdired-do-renames): Move point with renamed file and don't lose
+       mark status (Bug#11795).
+
 2012-10-16  Juri Linkov  <address@hidden>
 
        * replace.el (query-replace-help): Mention multi-buffer replacement

=== modified file 'lisp/wdired.el'
--- a/lisp/wdired.el    2012-08-05 04:19:21 +0000
+++ b/lisp/wdired.el    2012-10-17 09:11:49 +0000
@@ -180,7 +180,7 @@
 (defvar wdired-col-perm) ;; Column where the permission bits start
 (defvar wdired-old-content)
 (defvar wdired-old-point)
-
+(defvar wdired-old-marks)
 
 (defun wdired-mode ()
   "Writable Dired (WDired) mode.
@@ -221,6 +221,8 @@
     (error "Not a Dired buffer"))
   (set (make-local-variable 'wdired-old-content)
        (buffer-substring (point-min) (point-max)))
+  (set (make-local-variable 'wdired-old-marks)
+       (dired-remember-marks (point-min) (point-max)))
   (set (make-local-variable 'wdired-old-point) (point))
   (set (make-local-variable 'query-replace-skip-read-only) t)
   (set (make-local-variable 'isearch-filter-predicate)
@@ -455,7 +457,8 @@
               (push (cons tmp file-new) residue))))
          (t
           (setq progress t)
-          (let ((file-ori (car rename)))
+          (let* ((file-ori (car rename))
+                 (old-mark (cdr (assoc file-ori wdired-old-marks))))
             (if wdired-use-interactive-rename
                 (wdired-search-and-rename file-ori file-new)
               ;; If dired-rename-file autoloads dired-aux while
@@ -466,12 +469,17 @@
               (condition-case err
                   (let ((dired-backup-overwrite nil))
                     (dired-rename-file file-ori file-new
-                                       overwrite))
+                                       overwrite)
+                    (dired-remove-file file-ori)
+                    (dired-add-file file-new (if (integerp 
dired-keep-marker-rename)
+                                                 dired-keep-marker-rename
+                                               old-mark)))
                 (error
                  (setq errors (1+ errors))
                  (dired-log (concat "Rename `" file-ori "' to `"
                                     file-new "' failed:\n%s\n")
-                            err)))))))))
+                            err)
+                 (dired-add-entry file-ori old-mark)))))))))
     errors))