From b5700de650026a978c13688f1a2c6289c4b97ec1 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 10 Jun 2009 15:16:55 +0000 Subject: [PATCH] * basic.texi (Moving Point): Fix tag. * picture-xtra.texi (Insert in Picture): Use and . * mini.texi (Completion Commands): Decapitalize and , and use camel-case for PageUp and PageDown. * display.texi (Scrolling): Decapitalize and , and use camel-case for PageUp and PageDown. * calendar.texi (Scroll Calendar): Decapitalize and . * search.texi (Isearch Scroll): Decapitalize and . --- doc/emacs/ChangeLog | 13 +++++++++++++ doc/emacs/basic.texi | 2 +- doc/emacs/calendar.texi | 6 +++--- doc/emacs/display.texi | 18 +++++++++--------- doc/emacs/mini.texi | 13 +++++++------ doc/emacs/picture-xtra.texi | 4 ++-- doc/emacs/search.texi | 10 +++++----- 7 files changed, 40 insertions(+), 26 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index dfad010279a..ce44e873e37 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,6 +1,19 @@ 2009-06-10 Chong Yidong + * basic.texi (Moving Point): Fix tag. + + * picture-xtra.texi (Insert in Picture): Use and . + + * mini.texi (Completion Commands): Decapitalize and , and + use camel-case for PageUp and PageDown. + + * display.texi (Scrolling): Decapitalize and , and use + camel-case for PageUp and PageDown. + + * calendar.texi (Scroll Calendar): Decapitalize and . + * search.texi (Isearch Scroll): Add isearch-allow-scroll to index. + (Isearch Scroll): Decapitalize and . 2009-06-09 Agustín Martín diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 72ab17c33ac..4973b4a96d0 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -208,7 +208,7 @@ thing as @key{C-v}. Scrolling commands are described further in Scroll one screen backward, and move point if necessary to put it on the screen (@code{scroll-down}). If your keyboard has a @key{PageUp} key (sometimes labelled @key{prior}), it does the same thing as -@key{M-v}. +@kbd{M-v}. @item M-x goto-char Read a number @var{n} and move point to buffer position @var{n}. Position 1 is the beginning of the buffer. diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 77ee62acfd5..8b56b656a3f 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -245,11 +245,11 @@ Scroll calendar one month forward (@code{calendar-scroll-left}). @item < Scroll calendar one month backward (@code{calendar-scroll-right}). @item C-v -@itemx @key{NEXT} +@itemx @key{next} Scroll calendar three months forward (@code{calendar-scroll-left-three-months}). @item M-v -@itemx @key{PRIOR} +@itemx @key{prior} Scroll calendar three months backward (@code{calendar-scroll-right-three-months}). @end table @@ -276,7 +276,7 @@ repeat count; in particular, since @kbd{C-u} multiplies the next command by four, typing @kbd{C-u C-v} scrolls the calendar forward by a year and typing @kbd{C-u M-v} scrolls the calendar backward by a year. - The function keys @key{NEXT} and @key{PRIOR} are equivalent to + The function keys @key{next} and @key{prior} are equivalent to @kbd{C-v} and @kbd{M-v}, just as they are in other modes. @node Counting Days diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 905b47b3b0b..859ed50194b 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -56,12 +56,12 @@ commands: Scroll the selected window to center point vertically within it and redisplay the screen (@code{recenter-top-bottom}). @item C-v -@itemx @key{NEXT} -@itemx @key{PAGEDOWN} +@itemx @key{next} +@itemx @key{PageDown} Scroll forward by nearly a full window (@code{scroll-up}). @item M-v -@itemx @key{PRIOR} -@itemx @key{PAGEUP} +@itemx @key{prior} +@itemx @key{PageUp} Scroll backward (@code{scroll-down}). @item C-M-l Scroll heuristically to bring useful information onto the screen @@ -97,10 +97,10 @@ clear the screen or cycle through different screen positions. @kindex C-v @kindex M-v -@kindex NEXT -@kindex PRIOR -@kindex PAGEDOWN -@kindex PAGEUP +@kindex next +@kindex prior +@kindex PageDown +@kindex PageUp @findex scroll-up @findex scroll-down To read the buffer a windowful at a time, use @kbd{C-v} @@ -115,7 +115,7 @@ top, it ends up at the new top of the window. @vindex next-screen-context-lines The variable @code{next-screen-context-lines} controls the number of lines of overlap left by @kbd{C-v} or @kbd{M-v}; by default, it is 2. -The function keys @key{NEXT} and @key{PRIOR}, or @key{PageDown} and +The function keys @key{next} and @key{prior}, or @key{PageDown} and @key{PageUp}, are equivalent to @kbd{C-v} and @kbd{M-v} respectively. You can supply @kbd{C-v} or @kbd{M-v} with a numeric prefix argument diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 4a2febaa29b..37d483d3f9d 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -182,10 +182,11 @@ maximum number of lines; @code{nil} means do not resize the minibuffer window automatically. The default value is 0.25. The @kbd{C-M-v} command in the minibuffer scrolls the help text from -commands that display help text of any sort in another window. -@kbd{M-@key{PAGEUP}} and @kbd{M-@key{PAGEDOWN}} also operate on that -help text. This is especially useful with long lists of possible -completions. @xref{Other Window}. +commands that display help text of any sort in another window. You +can also scroll the help text with @kbd{M-@key{prior}} and +@kbd{M-@key{next}} (or, equivalently, @kbd{M-@key{PageUp}} and +@kbd{M-@key{PageDown}}). This is especially useful with long lists of +possible completions. @xref{Other Window}. @vindex enable-recursive-minibuffers Emacs normally disallows most commands that use the minibuffer while @@ -343,11 +344,11 @@ completion (@code{mouse-choose-completion}). @findex switch-to-completions @item M-v @itemx @key{PageUp} -@itemx @key{PRIOR} +@itemx @key{prior} Typing @kbd{M-v}, while in the minibuffer, selects the window showing the completion list buffer (@code{switch-to-completions}). This paves the way for using the commands below. Typing @key{PageUp} or -@key{PRIOR} does the same, as does selecting that window in other +@key{prior} does the same, as does selecting that window in other ways. @findex choose-completion diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index acac338ea2c..64476b62d70 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -165,7 +165,7 @@ Move down after insertion (@code{picture-movement-down}). @itemx C-c @key{HOME} Move up and left (``northwest'') after insertion (@code{picture-movement-nw}). @item C-c ' -@itemx C-c @key{PAGEUP} +@itemx C-c @key{prior} Move up and right (``northeast'') after insertion (@code{picture-movement-ne}). @item C-c / @@ -173,7 +173,7 @@ Move up and right (``northeast'') after insertion Move down and left (``southwest'') after insertion @*(@code{picture-movement-sw}). @item C-c \ -@itemx C-c @key{PAGEDOWN} +@itemx C-c @key{next} Move down and right (``southeast'') after insertion @*(@code{picture-movement-se}). @end table diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index ce95f6da4f0..304ca1c6e97 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -305,11 +305,11 @@ search string. It uses the same text that @kbd{C-y} would yank. search (without exiting the search) by setting the customizable variable @code{isearch-allow-scroll} to a non-@code{nil} value. This applies to using the vertical scroll-bar and to certain keyboard -commands such as @kbd{@key{PRIOR}} (@code{scroll-down}), -@kbd{@key{NEXT}} (@code{scroll-up}) and @kbd{C-l} (@code{recenter}). -You must run these commands via their key sequences to stay in the -search---typing @kbd{M-x} will terminate the search. You can give -prefix arguments to these commands in the usual way. +commands such as @key{prior} (@code{scroll-down}), @key{next} +(@code{scroll-up}) and @kbd{C-l} (@code{recenter}). You must run +these commands via their key sequences to stay in the search---typing +@kbd{M-x} will terminate the search. You can give prefix arguments to +these commands in the usual way. This feature won't let you scroll the current match out of visibility, however. -- 2.39.2