(wdired-change-to-wdired-mode): Quote wdired-mode-hook in run-hooks.

Use substitute-command-keys in message.
(wdired-abort-changes): Add message.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e91f9a357407be1e0d5a9fa4e7b2dc70acca45e..740cdeaa03ee191c42285eab2dca6831b4445be7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-05  Lars Hansen  <larsh@math.ku.dk>
+
+       * wdired.el (wdired-change-to-wdired-mode): Quote wdired-mode-hook
+       in run-hooks. Use substitute-command-keys in message.
+       (wdired-abort-changes): Add message.
+
 2004-05-03  Michael Mauger  <mmaug@yahoo.com>
 
        * emacs/lisp/progmodes/sql.el (sql-xemacs-p, sql-emacs19-p)

diff --git a/lisp/wdired.el b/lisp/wdired.el
index a8c36c2066feb68c333cceae3014e190cd145968..30ba2a3cd4541737b3121639e1715669ee924992 100644 (file)
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -329,8 +329,8 @@ See `wdired-mode'."
   (buffer-enable-undo) ; Performance hack. See above.
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)
-  (run-hooks wdired-mode-hook)
-  (message "Press C-c C-c when finished"))
+  (run-hooks 'wdired-mode-hook)
+  (message (substitute-command-keys "Press \\[wdired-finish-edit] when finished")))
 
 
 ;; Protect the buffer so only the filenames can be changed, and put
@@ -416,7 +416,8 @@ non-nil means return old filename."
     (insert wdired-old-content))
   (wdired-change-to-dired-mode)
   (set-buffer-modified-p nil)
-  (setq buffer-undo-list nil))
+  (setq buffer-undo-list nil)
+  (message "Changes aborted"))
 
 (defun wdired-finish-edit ()
   "Actually rename files based on your editing in the Dired buffer."