aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-02 17:42:37 +0200
committerLars Magne Ingebrigtsen2011-07-02 17:42:37 +0200
commitff9ad3302d38b35b5935195111f6729347f2d68b (patch)
tree85351fc49936b5c9da051d49aa66722716128e9f
parent28ee97c77e96407db0bf39f7fb479f0100d3a2c3 (diff)
downloademacs-ff9ad3302d38b35b5935195111f6729347f2d68b.tar.gz
emacs-ff9ad3302d38b35b5935195111f6729347f2d68b.zip
* dired.texi (Subdirectories in Dired): Clarify the `C-u k'
doesn't actually delete any files (bug#7125).
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/dired.texi11
2 files changed, 9 insertions, 5 deletions
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 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * dired.texi (Subdirectories in Dired): Clarify the `C-u k'
4 doesn't actually delete any files (bug#7125).
5
3 * picture-xtra.texi (Rectangles in Picture): Clarify the prefix 6 * picture-xtra.texi (Rectangles in Picture): Clarify the prefix
4 argument for `C-c C-k' (bug#7391). 7 argument for `C-c C-k' (bug#7391).
5 8
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.
984 984
985Use the @kbd{l} command (@code{dired-do-redisplay}) to update the 985Use the @kbd{l} command (@code{dired-do-redisplay}) to update the
986subdirectory's contents. Use @kbd{C-u k} on the subdirectory header 986subdirectory's contents. Use @kbd{C-u k} on the subdirectory header
987line to delete the subdirectory (@pxref{Dired Updating}). You can also 987line to remove the subdirectory listing (@pxref{Dired Updating}). You
988hide and show inserted subdirectories (@pxref{Hiding Subdirectories}). 988can also hide and show inserted subdirectories (@pxref{Hiding
989Subdirectories}).
989 990
990@ifnottex 991@ifnottex
991@include dired-xtra.texi 992@include dired-xtra.texi
@@ -1145,9 +1146,9 @@ current file as a last resort.
1145 1146
1146 If you use @kbd{k} with a numeric prefix argument to kill the line 1147 If you use @kbd{k} with a numeric prefix argument to kill the line
1147for a file that is a directory, which you have inserted in the Dired 1148for a file that is a directory, which you have inserted in the Dired
1148buffer as a subdirectory, it deletes that subdirectory from the buffer 1149buffer as a subdirectory, it removed that subdirectory line from the
1149as well. Typing @kbd{C-u k} on the header line for a subdirectory 1150buffer as well. Typing @kbd{C-u k} on the header line for a
1150also deletes the subdirectory from the Dired buffer. 1151subdirectory also removes the subdirectory line from the Dired buffer.
1151 1152
1152 The @kbd{g} command brings back any individual lines that you have 1153 The @kbd{g} command brings back any individual lines that you have
1153killed in this way, but not subdirectories---you must use @kbd{i} to 1154killed in this way, but not subdirectories---you must use @kbd{i} to