[Emacs-diffs] emacs-26 45d0475: More manual editing

[Michael Albinus]

branch: emacs-26
commit 45d04754e718846b1a2a84a1eac6b5a54f3ade16
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    More manual editing
    
    * doc/emacs/basic.texi:
    * doc/emacs/calendar.texi:
    * doc/emacs/display.texi:
    * doc/emacs/mini.texi:
    * doc/emacs/misc.texi:
    * doc/emacs/picture-xtra.texi:
    * doc/misc/info.texi: Prefer <PageDown> and <PageUp> over
    <next> and <prior>.  Add missing @kindex entries.
    
    * doc/emacs/custom.texi (Function Keys): Fix and add missing
    key symbols.
---
 doc/emacs/basic.texi        |  6 ++++++
 doc/emacs/calendar.texi     | 11 +++++++++--
 doc/emacs/custom.texi       |  7 +++++--
 doc/emacs/display.texi      | 12 ++++++------
 doc/emacs/mini.texi         |  8 ++++----
 doc/emacs/misc.texi         | 12 ++++++++----
 doc/emacs/picture-xtra.texi | 12 ++++++++++++
 doc/misc/info.texi          | 10 ++++++----
 8 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 3fec5f4..f911c67 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -285,12 +285,18 @@ displays, @address@hidden does the same.
 @item C-v
 @itemx @key{PageDown}
 @itemx @key{next}
address@hidden C-v
address@hidden PageDown
address@hidden next
 Scroll the display one screen forward, and move point onscreen if
 necessary (@code{scroll-up-command}).  @xref{Scrolling}.
 
 @item M-v
 @itemx @key{PageUp}
 @itemx @key{prior}
address@hidden M-v
address@hidden PageUp
address@hidden prior
 Scroll one screen backward, and move point onscreen if necessary
 (@code{scroll-down-command}).  @xref{Scrolling}.
 
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index c6a84b5..7021146 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -246,9 +246,11 @@ Scroll calendar one month forward 
(@code{calendar-scroll-left}).
 @item <
 Scroll calendar one month backward (@code{calendar-scroll-right}).
 @item C-v
address@hidden @key{PageDown}
 @itemx @key{next}
 Scroll forward by three months (@code{calendar-scroll-left-three-months}).
 @item M-v
address@hidden @key{PageUp}
 @itemx @key{prior}
 Scroll backward by three months (@code{calendar-scroll-right-three-months}).
 @end table
@@ -264,8 +266,12 @@ calendar contents one month forward in time.  @kbd{<} 
scrolls the
 contents one month backwards in time.
 
 @kindex C-v @r{(Calendar mode)}
address@hidden PageDown @r{(Calendar mode)}
address@hidden next @r{(Calendar mode)}
 @findex calendar-scroll-left-three-months
 @kindex M-v @r{(Calendar mode)}
address@hidden PageUp @r{(Calendar mode)}
address@hidden prior @r{(Calendar mode)}
 @findex calendar-scroll-right-three-months
   The commands @kbd{C-v} and @kbd{M-v} scroll the calendar by an entire
 screenful---three months---in analogy with the usual meaning of
@@ -275,8 +281,9 @@ 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
address@hidden and @kbd{M-v}, just as they are in other modes.
+  The function keys @key{PageDown} (or @key{next}) and @key{PageUp}
+(or @key{prior}) are equivalent to @kbd{C-v} and @kbd{M-v}, just as
+they are in other modes.
 
 @node Counting Days
 @section Counting Days
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index ee4b6a1..e64686f 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1852,10 +1852,10 @@ the corresponding Lisp symbol.  Here are the 
conventional Lisp names for
 common function keys:
 
 @table @asis
address@hidden @code{LEFT}, @code{UP}, @code{RIGHT}, @code{DOWN}
address@hidden @code{left}, @code{up}, @code{right}, @code{down}
 Cursor arrow keys.
 
address@hidden @code{Begin}, @code{End}, @code{Home}, @code{next}, @code{prior}
address@hidden @code{begin}, @code{end}, @code{home}, @code{next}, @code{prior}
 Other cursor repositioning keys.
 
 @item @code{select}, @code{print}, @code{execute}, @code{backtab}
@@ -1869,6 +1869,9 @@ Numbered function keys (across the top of the keyboard).
 @item @code{kp-add}, @code{kp-subtract}, @code{kp-multiply}, @code{kp-divide}
 @itemx @code{kp-backtab}, @code{kp-space}, @code{kp-tab}, @code{kp-enter}
 @itemx @code{kp-separator}, @code{kp-decimal}, @code{kp-equal}
address@hidden @code{kp-prior}, @code{kp-next}, @code{kp-end}, @code{kp-home}
address@hidden @code{kp-left}, @code{kp-up}, @code{kp-right}, @code{kp-down}
address@hidden @code{kp-insert }, @code{kp-delete}
 Keypad keys (to the right of the regular keyboard), with names or punctuation.
 
 @item @code{kp-0}, @code{kp-1}, @dots{} @code{kp-9}
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 42a5227..c60cf64 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -68,21 +68,21 @@ Scrolling}).  You can also scroll explicitly with these 
commands:
 
 @table @kbd
 @item C-v
address@hidden @key{next}
 @itemx @key{PageDown}
address@hidden @key{next}
 Scroll forward by nearly a full window (@code{scroll-up-command}).
 @item M-v
address@hidden @key{prior}
 @itemx @key{PageUp}
address@hidden @key{prior}
 Scroll backward (@code{scroll-down-command}).
 @end table
 
 @kindex C-v
 @kindex M-v
address@hidden next
address@hidden prior
 @kindex PageDown
 @kindex PageUp
address@hidden next
address@hidden prior
 @findex scroll-up-command
 @findex scroll-down-command
   @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the
@@ -90,10 +90,10 @@ whole window height.  The effect is to take the two lines 
at the
 bottom of the window and put them at the top, followed by lines that
 were not previously visible.  If point was in the text that scrolled
 off the top, it ends up on the window's new topmost line.  The
address@hidden (or @key{PageDown}) key is equivalent to @kbd{C-v}.
address@hidden (or @key{next}) key is equivalent to @kbd{C-v}.
 
   @kbd{M-v} (@code{scroll-down-command}) scrolls backward in a similar
-way.  The @key{prior} (or @key{PageUp}) key is equivalent to
+way.  The @key{PageUp} (or @key{prior}) key is equivalent to
 @kbd{M-v}.
 
 @vindex next-screen-context-lines
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index b4ebb7d..e180d1d 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -216,9 +216,9 @@ 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.  You
-can also scroll the help text with @address@hidden and
address@hidden@key{next}} (or, equivalently, @address@hidden and
address@hidden@key{PageDown}}).  This is especially useful with long lists of
+can also scroll the help text with @address@hidden and
address@hidden@key{PageDown}} (or, equivalently, @address@hidden and
address@hidden@key{next}}).  This is especially useful with long lists of
 possible completions.  @xref{Other Window}.
 
 @vindex enable-recursive-minibuffers
@@ -812,7 +812,7 @@ File ‘foo.el’ exists; overwrite? (y or n)
 Because this query does not actually use the minibuffer, the usual
 minibuffer editing commands cannot be used.  However, you can perform
 some window scrolling operations while the query is active: @kbd{C-l}
-recenters the selected window; @kbd{C-v} (or @key{PageDown} or
+recenters the selected window; @kbd{C-v} (or @key{PageDown}, or
 @key{next}) scrolls forward; @kbd{M-v} (or @key{PageUp}, or
 @key{prior}) scrolls backward; @kbd{C-M-v} scrolls forward in the next
 window; and @kbd{C-M-S-v} scrolls backward in the next window.  Typing
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index ba90904..28ff8a0 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -492,12 +492,16 @@ displays the next page if you are at the end of the 
current page.
 @findex doc-view-previous-page
 @kindex n @r{(DocView mode)}
 @kindex p @r{(DocView mode)}
address@hidden PageDown @r{(DocView mode)}
address@hidden PageUp @r{(DocView mode)}
address@hidden next @r{(DocView mode)}
address@hidden prior @r{(DocView mode)}
 @kindex C-x ] @r{(DocView mode)}
 @kindex C-x [ @r{(DocView mode)}
-  You can also display the next page by typing @kbd{n}, @key{next} or
address@hidden ]} (@code{doc-view-next-page}).  To display the previous
-page, type @kbd{p}, @key{prior} or @kbd{C-x [}
-(@code{doc-view-previous-page}).
+  You can also display the next page by typing @kbd{n},
address@hidden, @key{next} or @kbd{C-x ]} (@code{doc-view-next-page}).
+To display the previous page, type @kbd{p}, @key{PageUp}, @key{prior}
+or @kbd{C-x [} (@code{doc-view-previous-page}).
 
 @findex doc-view-scroll-up-or-next-page
 @findex doc-view-scroll-down-or-previous-page
diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi
index 8a9dbcf..288a6e8 100644
--- a/doc/emacs/picture-xtra.texi
+++ b/doc/emacs/picture-xtra.texi
@@ -136,13 +136,23 @@ Picture}).
 @findex picture-movement-sw
 @findex picture-movement-se
 @kindex C-c < @r{(Picture mode)}
address@hidden C-c LEFT @r{(Picture mode)}
 @kindex C-c > @r{(Picture mode)}
address@hidden C-c RIGHT @r{(Picture mode)}
 @kindex C-c ^ @r{(Picture mode)}
address@hidden C-c UP @r{(Picture mode)}
 @kindex C-c . @r{(Picture mode)}
address@hidden C-c DOWN @r{(Picture mode)}
 @kindex C-c ` @r{(Picture mode)}
address@hidden C-c Home @r{(Picture mode)}
 @kindex C-c ' @r{(Picture mode)}
address@hidden C-c PageUp @r{(Picture mode)}
address@hidden C-c prior @r{(Picture mode)}
 @kindex C-c / @r{(Picture mode)}
address@hidden C-c End @r{(Picture mode)}
 @kindex C-c \ @r{(Picture mode)}
address@hidden C-c PageDown @r{(Picture mode)}
address@hidden C-c next @r{(Picture mode)}
   Since self-inserting characters in Picture mode overwrite and move
 point, there is no essential restriction on how point should be moved.
 Normally point moves right, but you can specify any of the eight
@@ -166,6 +176,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 '
address@hidden C-c @key{PageUp}
 @itemx C-c @key{prior}
 Move up and right (``northeast'') after insertion
 (@code{picture-movement-ne}).
@@ -174,6 +185,7 @@ Move up and right (``northeast'') after insertion
 Move down and left (``southwest'') after insertion
 @*(@code{picture-movement-sw}).
 @item C-c \
address@hidden C-c @key{PageDown}
 @itemx C-c @key{next}
 Move down and right (``southeast'') after insertion
 @*(@code{picture-movement-se}).
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 964a6c6..3e87193 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -363,13 +363,15 @@ the menu, one by one.  Once you reach the end of a node, 
and have seen
 all of its subnodes, @key{SPC} takes you to the next node or to the
 parent's next node.
 
address@hidden PAGEUP @r{(Info mode)}
address@hidden PAGEDOWN @r{(Info mode)}
address@hidden PageUp @r{(Info mode)}
address@hidden PageDown @r{(Info mode)}
address@hidden prior @r{(Info mode)}
address@hidden next @r{(Info mode)}
   Many keyboards nowadays have two scroll keys labeled @samp{PageUp}
-and @samp{PageDown} (or maybe @samp{Prior} and @samp{Next}).  If your
+and @samp{PageDown} (or maybe @samp{prior} and @samp{next}).  If your
 keyboard has these keys, you can use them to move forward and backward
 through the text of one node, like @key{SPC} and @key{BACKSPACE} (or
address@hidden).  However, @key{PAGEUP} and @key{PAGEDOWN} keys never
address@hidden).  However, @key{PageUp} and @key{PageDown} keys never
 scroll beyond the beginning or the end of the current node.
 
 @kindex C-l @r{(Info mode)}