aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-06-07 10:23:13 +0000
committerEli Zaretskii2001-06-07 10:23:13 +0000
commitc31492676e87aee69ece0c1423f9e56feae7b61d (patch)
tree723f751c44d3bad1731842cac0e6b2cdfbf51b61
parentcada28bb172af78670e3afdd03f0bde80d17d950 (diff)
downloademacs-c31492676e87aee69ece0c1423f9e56feae7b61d.tar.gz
emacs-c31492676e87aee69ece0c1423f9e56feae7b61d.zip
Change "Dired Commands" to "Dired Navigation". Move the general
explanation of Dired bindings to the chapter intro. Document dired-up-directory and its key `^'.
-rw-r--r--man/dired.texi36
-rw-r--r--man/emacs.texi2
2 files changed, 25 insertions, 13 deletions
diff --git a/man/dired.texi b/man/dired.texi
index 8bb014a59b9..04ce0bc38db 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -12,12 +12,19 @@ optionally some of its subdirectories as well. You can use the normal
12Emacs commands to move around in this buffer, and special Dired commands 12Emacs commands to move around in this buffer, and special Dired commands
13to operate on the files listed. 13to operate on the files listed.
14 14
15 The Dired buffer is ``read-only,'' and inserting text in it is not
16useful, so ordinary printing characters such as @kbd{d} and @kbd{x} are
17used for special Dired commands. Some Dired commands @dfn{mark} or
18@dfn{flag} the @dfn{current file} (that is, the file on the current
19line); other commands operate on the marked files or on the flagged
20files.
21
15 The Dired-X package provides various extra features for Dired mode. 22 The Dired-X package provides various extra features for Dired mode.
16@xref{Dired-X,,,dired-x, Dired Extra Version 2 User's Manual}. 23@xref{Dired-X,,,dired-x, Dired Extra Version 2 User's Manual}.
17 24
18@menu 25@menu
19* Enter: Dired Enter. How to invoke Dired. 26* Enter: Dired Enter. How to invoke Dired.
20* Commands: Dired Commands. Commands in the Dired buffer. 27* Navigation: Dired Navigation. How to move in the Dired buffer.
21* Deletion: Dired Deletion. Deleting files with Dired. 28* Deletion: Dired Deletion. Deleting files with Dired.
22* Flagging Many Files:: Flagging files based on their names. 29* Flagging Many Files:: Flagging files based on their names.
23* Visit: Dired Visiting. Other file operations through Dired. 30* Visit: Dired Visiting. Other file operations through Dired.
@@ -61,15 +68,8 @@ selected window, use @kbd{C-x 4 d} (@code{dired-other-window}) instead
61of @kbd{C-x d}. @kbd{C-x 5 d} (@code{dired-other-frame}) uses a 68of @kbd{C-x d}. @kbd{C-x 5 d} (@code{dired-other-frame}) uses a
62separate frame to display the Dired buffer. 69separate frame to display the Dired buffer.
63 70
64@node Dired Commands 71@node Dired Navigation
65@section Commands in the Dired Buffer 72@section Navigation in the Dired Buffer
66
67 The Dired buffer is ``read-only,'' and inserting text in it is not
68useful, so ordinary printing characters such as @kbd{d} and @kbd{x} are
69used for special Dired commands. Some Dired commands @dfn{mark} or
70@dfn{flag} the @dfn{current file} (that is, the file on the current
71line); other commands operate on the marked files or on the flagged
72files.
73 73
74@kindex C-n @r{(Dired)} 74@kindex C-n @r{(Dired)}
75@kindex C-p @r{(Dired)} 75@kindex C-p @r{(Dired)}
@@ -85,13 +85,16 @@ to @kbd{C-n}. @kbd{p} is equivalent to @kbd{C-p}. (Moving by lines is
85so common in Dired that it deserves to be easy to type.) @key{DEL} 85so common in Dired that it deserves to be easy to type.) @key{DEL}
86(move up and unflag) is often useful simply for moving up. 86(move up and unflag) is often useful simply for moving up.
87 87
88 Some additional navigation commands are available when the Dired
89buffer includes several directories. @xref{Subdirectory Motion}.
90
88@node Dired Deletion 91@node Dired Deletion
89@section Deleting Files with Dired 92@section Deleting Files with Dired
90@cindex flagging files (in Dired) 93@cindex flagging files (in Dired)
91@cindex deleting files (in Dired) 94@cindex deleting files (in Dired)
92 95
93 The primary use of Dired is to @dfn{flag} files for deletion and then 96 One of the most frequent uses of Dired is to @dfn{flag} files for
94delete the files previously flagged. 97deletion and then delete the files previously flagged.
95 98
96@table @kbd 99@table @kbd
97@item d 100@item d
@@ -237,7 +240,9 @@ Visit the file described on the current line, like typing @kbd{C-x C-f}
237and supplying that file name (@code{dired-find-file}). @xref{Visiting}. 240and supplying that file name (@code{dired-find-file}). @xref{Visiting}.
238 241
239@item @key{RET} 242@item @key{RET}
243@itemx e
240@kindex RET @r{(Dired)} 244@kindex RET @r{(Dired)}
245@kindex e @r{(Dired)}
241Equivalent to @kbd{f}. 246Equivalent to @kbd{f}.
242 247
243@item a 248@item a
@@ -275,6 +280,13 @@ View the file described on the current line, using @kbd{M-x view-file}
275Viewing a file is like visiting it, but is slanted toward moving around 280Viewing a file is like visiting it, but is slanted toward moving around
276in the file conveniently and does not allow changing the file. 281in the file conveniently and does not allow changing the file.
277@xref{Misc File Ops,View File, Miscellaneous File Operations}. 282@xref{Misc File Ops,View File, Miscellaneous File Operations}.
283
284@item ^
285@kindex ^ @r{(Dired)}
286@findex dired-up-directory
287Visit the parent directory of the current directory
288(@code{dired-up-directory}). This is more convenient than moving to
289the parent directory's line and typing @kbd{f} there.
278@end table 290@end table
279 291
280@node Marks vs Flags 292@node Marks vs Flags
diff --git a/man/emacs.texi b/man/emacs.texi
index 2d1d28724cc..7cf75636b92 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -600,7 +600,7 @@ Reading Mail with Rmail
600Dired, the Directory Editor 600Dired, the Directory Editor
601 601
602* Dired Enter:: How to invoke Dired. 602* Dired Enter:: How to invoke Dired.
603* Dired Commands:: Commands in the Dired buffer. 603* Dired Navigation:: How to move in the Dired buffer.
604* Dired Deletion:: Deleting files with Dired. 604* Dired Deletion:: Deleting files with Dired.
605* Flagging Many Files:: Flagging files based on their names. 605* Flagging Many Files:: Flagging files based on their names.
606* Dired Visiting:: Other file operations through Dired. 606* Dired Visiting:: Other file operations through Dired.