From e2aeef63a646f08348c53b1ad94384f427593209 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 28 Aug 2011 17:15:20 -0400 Subject: [PATCH] Add xrefs to View Mode node to Emacs manual. * doc/emacs/files.texi (File Archives): * doc/emacs/cal-xtra.texi (Diary Display): * doc/emacs/help.texi (Help Mode): Add xref to View Mode. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/cal-xtra.texi | 8 +------- doc/emacs/display.texi | 5 +++-- doc/emacs/files.texi | 14 +++++++------- doc/emacs/help.texi | 4 ++-- doc/lispref/ChangeLog | 2 ++ doc/lispref/files.texi | 11 ----------- 7 files changed, 21 insertions(+), 29 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a08bd212b25..58b98189e29 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2011-08-28 Chong Yidong + + * files.texi (File Archives): + * cal-xtra.texi (Diary Display): + * help.texi (Help Mode): Add xref to View Mode. + 2011-08-28 Chong Yidong * display.texi (View Mode): New node. Move view-file here from diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index 52898efc268..6d20c92a6d9 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -538,13 +538,7 @@ are no diary entries, even if that day is a holiday. If you want such days to be shown in the fancy diary buffer, set the variable @code{diary-list-include-blanks} to @code{t}.@refill -@c View mode does not seem to be described in the manual. -@c buffers.texi has a brief mention. - The fancy diary buffer enables View mode, a minor mode that provides -commands for scrolling and searching the text. For example, @key{SPC} -and @key{DEL} scroll forward and backward, and @key{s} starts an -incremental search. See the documentation of the function -@code{view-mode} for more information. + The fancy diary buffer enables View mode (@pxref{View Mode}). The alternative display method @code{diary-simple-display} shows the actual diary buffer, and uses invisible text to hide entries that don't diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index aaa04230b6f..09e365d9d5f 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -378,10 +378,11 @@ it. @xref{Disabling}. screenfuls. It provides commands for scrolling through the buffer conveniently but not for changing it. Apart from the usual Emacs cursor motion commands, you can type @key{SPC} to scroll forward one -windowful, or @key{DEL} to scroll backward. +windowful, @key{DEL} to scroll backward, and @kbd{s} to start an +incremental search. Typing @kbd{q} disables View mode, and switches back to the buffer -and position before View mode was enabled. Alternatively, type +and position before View mode was enabled. Alternatively, typing @kbd{e} disables View mode, keeping the current buffer and position. @findex view-buffer diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index a41e14e5fcb..2672c30363b 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1657,13 +1657,13 @@ Tar mode is used also for compressed archives---files with extensions The keys @kbd{e}, @kbd{f} and @key{RET} all extract a component file into its own buffer. You can edit it there, and if you save the buffer, the edited version will replace the version in the Tar buffer. -@kbd{v} extracts a file into a buffer in View mode. @kbd{o} extracts -the file and displays it in another window, so you could edit the file -and operate on the archive simultaneously. @kbd{d} marks a file for -deletion when you later use @kbd{x}, and @kbd{u} unmarks a file, as in -Dired. @kbd{C} copies a file from the archive to disk and @kbd{R} -renames a file within the archive. @kbd{g} reverts the buffer from -the archive on disk. +@kbd{v} extracts a file into a buffer in View mode (@pxref{View +Mode}). @kbd{o} extracts the file and displays it in another window, +so you could edit the file and operate on the archive simultaneously. +@kbd{d} marks a file for deletion when you later use @kbd{x}, and +@kbd{u} unmarks a file, as in Dired. @kbd{C} copies a file from the +archive to disk and @kbd{R} renames a file within the archive. +@kbd{g} reverts the buffer from the archive on disk. The keys @kbd{M}, @kbd{G}, and @kbd{O} change the file's permission bits, group, and owner, respectively. diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index bf93892c0db..9ff995138f5 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -405,8 +405,8 @@ the variable @code{apropos-documentation-sort-by-scores} is @node Help Mode @section Help Mode Commands - Help buffers provide the same commands as View mode (@pxref{Misc File -Ops}), plus a few special commands of their own. + Help buffers provide the same commands as View mode (@pxref{View +Mode}), plus a few special commands of their own. @table @kbd @item @key{SPC} diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b0328dba3f1..aae0be5a054 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -2,6 +2,8 @@ * files.texi (Changing Files, Create/Delete Dirs): Document new arguments for delete-file, delete-directory, and copy-directory. + (Visiting Functions): Remove view-file; it is documented in the + Emacs manual. * frames.texi (Layout Parameters): The defaults for the menu-bar-lines and tool-bar-lines parameters depend on the mode. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 25afb810a88..bd904bf49c0 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -203,17 +203,6 @@ When this command is called interactively, it prompts for @var{filename}. @end deffn -@deffn Command view-file filename -This command visits @var{filename} using View mode, returning to the -previous buffer when you exit View mode. View mode is a minor mode that -provides commands to skim rapidly through the file, but does not let you -modify the text. Entering View mode runs the normal hook -@code{view-mode-hook}. @xref{Hooks}. - -When @code{view-file} is called interactively, it prompts for -@var{filename}. -@end deffn - @defopt find-file-wildcards If this variable is non-@code{nil}, then the various @code{find-file} commands check for wildcard characters and visit all the files that -- 2.39.2