From: Lars Magne Ingebrigtsen Date: Sat, 2 Jul 2011 15:42:37 +0000 (+0200) Subject: * dired.texi (Subdirectories in Dired): Clarify the `C-u k' X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~240 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff9ad3302d38b35b5935195111f6729347f2d68b;p=emacs.git * dired.texi (Subdirectories in Dired): Clarify the `C-u k' doesn't actually delete any files (bug#7125). --- diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index ca56d4f8042..aff9c46b4d8 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * dired.texi (Subdirectories in Dired): Clarify the `C-u k' + doesn't actually delete any files (bug#7125). + * picture-xtra.texi (Rectangles in Picture): Clarify the prefix argument for `C-c C-k' (bug#7391). diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 2f274d7a324..fb3521e4316 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -984,8 +984,9 @@ to the parent directory in the same Dired buffer. Use the @kbd{l} command (@code{dired-do-redisplay}) to update the subdirectory's contents. Use @kbd{C-u k} on the subdirectory header -line to delete the subdirectory (@pxref{Dired Updating}). You can also -hide and show inserted subdirectories (@pxref{Hiding Subdirectories}). +line to remove the subdirectory listing (@pxref{Dired Updating}). You +can also hide and show inserted subdirectories (@pxref{Hiding +Subdirectories}). @ifnottex @include dired-xtra.texi @@ -1145,9 +1146,9 @@ current file as a last resort. If you use @kbd{k} with a numeric prefix argument to kill the line for a file that is a directory, which you have inserted in the Dired -buffer as a subdirectory, it deletes that subdirectory from the buffer -as well. Typing @kbd{C-u k} on the header line for a subdirectory -also deletes the subdirectory from the Dired buffer. +buffer as a subdirectory, it removed that subdirectory line from the +buffer as well. Typing @kbd{C-u k} on the header line for a +subdirectory also removes the subdirectory line from the Dired buffer. The @kbd{g} command brings back any individual lines that you have killed in this way, but not subdirectories---you must use @kbd{i} to