(wdired-old-point): New internal variable.

(wdired-change-to-wdired-mode): Set it buffer-locally.
(wdired-abort-changes): Restore point after aborting changes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da04556f4be92b54f18d022c30f91b5ff3628e36..999f8807902e702d5faf130e5c436d5431f9b6b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2005-12-14  Juri Linkov  <juri@jurta.org>
+
+       * help-macro.el (make-help-screen): Bind `inhibit-read-only' to t
+       around `erase-buffer' and `insert'.
+
+       * descr-text.el (describe-text-properties): Replace buffer name
+       "*Help-2*" with "*Help*<2>".
+       (describe-char): Add functions print-help-return-message,
+       toggle-read-only.  Use help-setup-xref with nil to not store
+       describe-char in help-xref-stack.  Use help-make-xrefs to
+       make [back] button.
+
+       * desktop.el (desktop-minor-mode-table): Add vc-dired-mode with nil.
+
+       * wdired.el (wdired-old-point): New internal variable.
+       (wdired-change-to-wdired-mode): Set it buffer-locally.
+       (wdired-abort-changes): Restore point after aborting changes.
+
 2005-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc.el (vc-do-command): Add a new value t for okstatus.

diff --git a/lisp/wdired.el b/lisp/wdired.el
index 55df66a70e68696a16b12a9113ed4584ac83cb02..56518691cad2880176b98143aeab7e4b71dc9dc8 100644 (file)
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -211,6 +211,7 @@ program `dired-chmod-program', which must exist."
 ;; Local variables (put here to avoid compilation gripes)
 (defvar wdired-col-perm) ;; Column where the permission bits start
 (defvar wdired-old-content)
+(defvar wdired-old-point)
 
 
 (defun wdired-mode ()
@@ -242,6 +243,7 @@ See `wdired-mode'."
   (interactive)
   (set (make-local-variable 'wdired-old-content)
        (buffer-substring (point-min) (point-max)))
+  (set (make-local-variable 'wdired-old-point) (point))
   (set (make-local-variable 'query-replace-skip-read-only) t)
   (use-local-map wdired-mode-map)
   (force-mode-line-update)
@@ -264,7 +266,8 @@ See `wdired-mode'."
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)
   (run-mode-hooks 'wdired-mode-hook)
-  (message "%s" (substitute-command-keys "Press \\[wdired-finish-edit] when finished \
+  (message "%s" (substitute-command-keys
+                "Press \\[wdired-finish-edit] when finished \
 or \\[wdired-abort-changes] to abort changes")))
 
 
@@ -348,7 +351,8 @@ non-nil means return old filename."
   (interactive)
   (let ((inhibit-read-only t))
     (erase-buffer)
-    (insert wdired-old-content))
+    (insert wdired-old-content)
+    (goto-char wdired-old-point))
   (wdired-change-to-dired-mode)
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)