diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2004-05-07 14:20:00 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2004-05-07 14:20:00 +0000 |
commit | 52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf (patch) | |
tree | 399c54ddfa7cac6c90a07a81308bf7f5e71b66bd /lisp/wdired.el | |
parent | b160ff41a813213adfa745a9d009ab638a22d7b1 (diff) | |
parent | a478f3e181bd9925ecb506abf4e49216d392124a (diff) | |
download | emacs-52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf.tar.gz emacs-52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf.tar.bz2 emacs-52f9ab73a16c71ffe7f8a1c25f9432bbe32f10cf.zip |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-268
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-269
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-270
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-271
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-272
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-273
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275
Update from CVS: man/makefile.w32-in: Revert last change
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-277
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-278
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-279
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-280
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-281
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-282
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-283
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-284
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-285
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-286
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-157
Diffstat (limited to 'lisp/wdired.el')
-rw-r--r-- | lisp/wdired.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/wdired.el b/lisp/wdired.el index a8c36c2066f..30ba2a3cd45 100644 --- 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." |