diff options
author | Eli Zaretskii <eliz@gnu.org> | 2014-04-29 18:17:02 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2014-04-29 18:17:02 +0300 |
commit | 119bf2f4b11567f918c0ae3a052f63328b9dd36a (patch) | |
tree | 486835e19999eca2b4eaae1f345016c6f13f7971 | |
parent | 4a25c1cb1e1be8fa3ceea455b7f442cfb507eb39 (diff) |
Few more doc fixes for bug #17362.
-rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
-rw-r--r-- | doc/emacs/anti.texi | 6 | ||||
-rw-r--r-- | doc/emacs/basic.texi | 20 | ||||
-rw-r--r-- | doc/emacs/buffers.texi | 12 | ||||
-rw-r--r-- | doc/emacs/commands.texi | 4 | ||||
-rw-r--r-- | doc/emacs/custom.texi | 8 | ||||
-rw-r--r-- | doc/emacs/indent.texi | 4 | ||||
-rw-r--r-- | doc/emacs/mark.texi | 2 | ||||
-rw-r--r-- | doc/emacs/mini.texi | 12 | ||||
-rw-r--r-- | doc/emacs/misc.texi | 6 | ||||
-rw-r--r-- | doc/emacs/picture-xtra.texi | 8 |
11 files changed, 43 insertions, 41 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 65847ebac8..4aeac46420 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -71,6 +71,8 @@ * basic.texi (Inserting Text, Erasing, Arguments): Fix usage of @kbd and @key. + * anti.texi (Antinews): Fix usage of @kbd and @key. + 2014-04-26 Eli Zaretskii <eliz@gnu.org> * sending.texi (Mail Signature): Document signature variables used diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index dcab8b57ae..d0de90690a 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -17,8 +17,8 @@ Support for displaying and editing ``bidirectional'' text has been removed. Text is now always displayed on the screen in a single consistent direction---left to right---regardless of the underlying script. Similarly, @kbd{C-f} and @kbd{C-b} always move the text -cursor to the right and left respectively. Also, @key{right} and -@key{left} are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might +cursor to the right and left respectively. Also, @key{RIGHT} and +@key{LEFT} are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might expect, rather than moving forward or backward based on the underlying ``paragraph direction''. @@ -36,7 +36,7 @@ and/or README file for details. @item The option @code{delete-active-region} has been deleted. When the -region is active, typing @key{DEL} or @key{delete} no longer deletes +region is active, typing @key{DEL} or @key{Delete} no longer deletes the text in the region; it deletes a single character instead. @item diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 3e8129c9d5..bec7774f2a 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -139,8 +139,8 @@ how many copies of the character to insert (@pxref{Arguments}). point (@pxref{Point}). The keyboard commands @kbd{C-f}, @kbd{C-b}, @kbd{C-n}, and @kbd{C-p} move point to the right, left, down, and up, respectively. You can also move point using the @dfn{arrow keys} -present on most keyboards: @kbd{@key{right}}, @kbd{@key{left}}, -@kbd{@key{down}}, and @kbd{@key{up}}; however, many Emacs users find +present on most keyboards: @key{RIGHT}, @key{LEFT}, +@key{DOWN}, and @key{UP}; however, many Emacs users find that it is slower to use the arrow keys than the control keys, because you need to move your hand to the area of the keyboard where those keys are located. @@ -156,7 +156,7 @@ keyboard commands that move point in more sophisticated ways. @findex forward-char Move forward one character (@code{forward-char}). -@item @key{right} +@item @key{RIGHT} @kindex RIGHT @findex right-char @vindex visual-order-cursor-movement @@ -176,7 +176,7 @@ away, depending on the surrounding bidirectional context. @findex backward-char Move backward one character (@code{backward-char}). -@item @key{left} +@item @key{LEFT} @kindex LEFT @findex left-char This command (@code{left-char}) behaves like @kbd{C-b}, except it @@ -187,7 +187,7 @@ left of the current screen position, moving to the previous or next screen line as appropriate. @item C-n -@itemx @key{down} +@itemx @key{DOWN} @kindex C-n @kindex DOWN @findex next-line @@ -196,7 +196,7 @@ to keep the horizontal position unchanged, so if you start in the middle of one line, you move to the middle of the next. @item C-p -@itemx @key{up} +@itemx @key{UP} @kindex C-p @kindex UP @findex previous-line @@ -222,8 +222,8 @@ Move to the end of the line (@code{move-end-of-line}). @findex forward-word Move forward one word (@code{forward-word}). -@item C-@key{right} -@itemx M-@key{right} +@item C-@key{RIGHT} +@itemx M-@key{RIGHT} @kindex C-RIGHT @kindex M-RIGHT @findex right-word @@ -236,8 +236,8 @@ right-to-left. @xref{Bidirectional Editing}. @findex backward-word Move backward one word (@code{backward-word}). -@item C-@key{left} -@itemx M-@key{left} +@item C-@key{LEFT} +@itemx M-@key{LEFT} @kindex C-LEFT @kindex M-LEFT @findex left-word diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 3c2beae28e..89b56da772 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -74,9 +74,9 @@ Similar, but select @var{buffer} in another window @item C-x 5 b @var{buffer} @key{RET} Similar, but select @var{buffer} in a separate frame (@code{switch-to-buffer-other-frame}). -@item C-x @key{left} +@item C-x @key{LEFT} Select the previous buffer in the buffer list (@code{previous-buffer}). -@item C-x @key{right} +@item C-x @key{RIGHT} Select the next buffer in the buffer list (@code{next-buffer}). @item C-u M-g M-g @itemx C-u M-g g @@ -110,15 +110,15 @@ it, Emacs asks for the file name to use, and the buffer's major mode is re-established taking that file name into account (@pxref{Choosing Modes}). -@kindex C-x @key{left} -@kindex C-x @key{right} +@kindex C-x @key{LEFT} +@kindex C-x @key{RIGHT} @findex next-buffer @findex previous-buffer For conveniently switching between a few buffers, use the commands -@kbd{C-x @key{left}} and @kbd{C-x @key{right}}. @kbd{C-x @key{left}} +@kbd{C-x @key{LEFT}} and @kbd{C-x @key{RIGHT}}. @kbd{C-x @key{LEFT}} (@code{previous-buffer}) selects the previous buffer (following the order of most recent selection in the current frame), while @kbd{C-x -@key{right}} (@code{next-buffer}) moves through buffers in the reverse +@key{RIGHT}} (@code{next-buffer}) moves through buffers in the reverse direction. @kindex C-x 4 b diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index 10612de82b..d9eba2d5a0 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -35,7 +35,7 @@ Therefore, this manual mainly documents how to edit with the keyboard. @samp{3}, @samp{=}, and the space character (denoted as @key{SPC}), are entered by typing the corresponding key. @dfn{Control characters}, such as @key{RET}, @key{TAB}, @key{DEL}, @key{ESC}, -@key{F1}, @key{Home}, and @key{left}, are also entered this way, as +@key{F1}, @key{Home}, and @key{LEFT}, are also entered this way, as are certain characters found on non-English keyboards (@pxref{International}). @@ -53,7 +53,7 @@ holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer to this as @kbd{C-a} for short. Similarly @kbd{@key{META}-a}, or @kbd{M-a} for short, is entered by holding down the @key{Alt} key and pressing @kbd{a}. Modifier keys can also be applied to non-alphanumerical -characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{left}}. +characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{LEFT}}. @cindex @key{ESC} replacing @key{META} key You can also type Meta characters using two-character sequences diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 96f2ef2107..9b78128d32 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1795,10 +1795,10 @@ the corresponding Lisp symbol. Here are the conventional Lisp names for common function keys: @table @asis -@item @code{left}, @code{up}, @code{right}, @code{down} +@item @code{LEFT}, @code{UP}, @code{RIGHT}, @code{DOWN} Cursor arrow keys. -@item @code{begin}, @code{end}, @code{home}, @code{next}, @code{prior} +@item @code{Begin}, @code{End}, @code{Home}, @code{next}, @code{prior} Other cursor repositioning keys. @item @code{select}, @code{print}, @code{execute}, @code{backtab} @@ -1836,8 +1836,8 @@ translates these keys to the corresponding keys in the main keyboard. For example, when @samp{Num Lock} is on, the key labeled @samp{8} on the numeric keypad produces @code{kp-8}, which is translated to @kbd{8}; when @samp{Num Lock} is off, the same key produces -@code{kp-up}, which is translated to @key{up}. If you rebind a key -such as @kbd{8} or @key{up}, it affects the equivalent keypad key too. +@code{kp-up}, which is translated to @key{UP}. If you rebind a key +such as @kbd{8} or @key{UP}, it affects the equivalent keypad key too. However, if you rebind a @samp{kp-} key directly, that won't affect its non-keypad equivalent. Note that the modified keys are not translated: for instance, if you hold down the @key{META} key while diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 8340d1031b..b254cfca43 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi @@ -127,9 +127,9 @@ in the region, moving the affected lines as a ``rigid'' unit. If called with no argument, the command activates a transient mode for adjusting the indentation of the affected lines interactively. While -this transient mode is active, typing @key{left} or @key{right} +this transient mode is active, typing @key{LEFT} or @key{RIGHT} indents leftward and rightward, respectively, by one space. You can -also type @kbd{S-@key{left}} or @kbd{S-@key{right}} to indent leftward +also type @kbd{S-@key{LEFT}} or @kbd{S-@key{RIGHT}} to indent leftward or rightward to the next tab stop (@pxref{Tab Stops}). Typing any other key disables the transient mode, and resumes normal editing. diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 2f7ea3b4e9..e3cda04ce5 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -133,7 +133,7 @@ detailed description of these mouse commands. @cindex shift-selection Finally, you can set the mark by holding down the shift key while -typing certain cursor motion commands (such as @kbd{S-@key{right}}, +typing certain cursor motion commands (such as @kbd{S-@key{RIGHT}}, @kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}. It sets the mark at point before moving point, but only if there is no active mark set via shift-selection. The mark set by mouse commands diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 8951c7dd5e..a87aff0e13 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -357,12 +357,12 @@ While in the completion list buffer, this chooses the completion at point (@code{choose-completion}). @findex next-completion -@item @key{right} +@item @key{RIGHT} While in the completion list buffer, this moves point to the following completion alternative (@code{next-completion}). @findex previous-completion -@item @key{left} +@item @key{LEFT} While in the completion list buffer, this moves point to the previous completion alternative (@code{previous-completion}). @end table @@ -587,11 +587,11 @@ argument into the minibuffer: @table @kbd @item M-p -@itemx @key{up} +@itemx @key{UP} Move to the previous item in the minibuffer history, an earlier argument (@code{previous-history-element}). @item M-n -@itemx @key{down} +@itemx @key{DOWN} Move to the next item in the minibuffer history (@code{next-history-element}). @item M-r @var{regexp} @key{RET} @@ -608,11 +608,11 @@ Move to a later item in the minibuffer history that matches @kindex DOWN @r{(minibuffer history)} @findex next-history-element @findex previous-history-element - While in the minibuffer, @kbd{M-p} or @key{up} + While in the minibuffer, @kbd{M-p} or @key{UP} (@code{previous-history-element}) moves through the minibuffer history list, one item at a time. Each @kbd{M-p} fetches an earlier item from the history list into the minibuffer, replacing its existing contents. -Typing @kbd{M-n} or @key{down} (@code{next-history-element}) moves +Typing @kbd{M-n} or @key{DOWN} (@code{next-history-element}) moves through the minibuffer history list in the opposite direction, fetching later entries into the minibuffer. diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index ce6f80618b..a2813f8b19 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -932,13 +932,13 @@ resubmit them or copy them to the end. Or you can use a @findex comint-previous-input @kindex M-p @r{(Shell mode)} @item M-p -@itemx C-@key{up} +@itemx C-@key{UP} Fetch the next earlier old shell command. @kindex M-n @r{(Shell mode)} @findex comint-next-input @item M-n -@itemx C-@key{down} +@itemx C-@key{DOWN} Fetch the next later old shell command. @kindex M-r @r{(Shell mode)} @@ -975,7 +975,7 @@ buffer. Successive use of @kbd{M-p} fetches successively earlier shell commands, each replacing any text that was already present as potential shell input. @kbd{M-n} does likewise except that it finds successively more recent shell commands from the buffer. -@kbd{C-@key{up}} works like @kbd{M-p}, and @kbd{C-@key{down}} like +@kbd{C-@key{UP}} works like @kbd{M-p}, and @kbd{C-@key{DOWN}} like @kbd{M-n}. The history search command @kbd{M-r} begins an incremental regular diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index 724f1bc3a0..6f29e92732 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -151,16 +151,16 @@ character. This is useful for drawing lines in the buffer. @table @kbd @item C-c < -@itemx C-c @key{left} +@itemx C-c @key{LEFT} Move left after insertion (@code{picture-movement-left}). @item C-c > -@itemx C-c @key{right} +@itemx C-c @key{RIGHT} Move right after insertion (@code{picture-movement-right}). @item C-c ^ -@itemx C-c @key{up} +@itemx C-c @key{UP} Move up after insertion (@code{picture-movement-up}). @item C-c . -@itemx C-c @key{down} +@itemx C-c @key{DOWN} Move down after insertion (@code{picture-movement-down}). @item C-c ` @itemx C-c @key{Home} |