aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-04-29 18:17:02 +0300
committerEli Zaretskii2014-04-29 18:17:02 +0300
commit119bf2f4b11567f918c0ae3a052f63328b9dd36a (patch)
tree486835e19999eca2b4eaae1f345016c6f13f7971
parent4a25c1cb1e1be8fa3ceea455b7f442cfb507eb39 (diff)
downloademacs-119bf2f4b11567f918c0ae3a052f63328b9dd36a.tar.gz
emacs-119bf2f4b11567f918c0ae3a052f63328b9dd36a.zip
Few more doc fixes for bug #17362.
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/anti.texi6
-rw-r--r--doc/emacs/basic.texi20
-rw-r--r--doc/emacs/buffers.texi12
-rw-r--r--doc/emacs/commands.texi4
-rw-r--r--doc/emacs/custom.texi8
-rw-r--r--doc/emacs/indent.texi4
-rw-r--r--doc/emacs/mark.texi2
-rw-r--r--doc/emacs/mini.texi12
-rw-r--r--doc/emacs/misc.texi6
-rw-r--r--doc/emacs/picture-xtra.texi8
11 files changed, 43 insertions, 41 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 65847ebac8e..4aeac464208 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -71,6 +71,8 @@
71 * basic.texi (Inserting Text, Erasing, Arguments): Fix usage of 71 * basic.texi (Inserting Text, Erasing, Arguments): Fix usage of
72 @kbd and @key. 72 @kbd and @key.
73 73
74 * anti.texi (Antinews): Fix usage of @kbd and @key.
75
742014-04-26 Eli Zaretskii <eliz@gnu.org> 762014-04-26 Eli Zaretskii <eliz@gnu.org>
75 77
76 * sending.texi (Mail Signature): Document signature variables used 78 * sending.texi (Mail Signature): Document signature variables used
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index dcab8b57aef..d0de90690a7 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -17,8 +17,8 @@ Support for displaying and editing ``bidirectional'' text has been
17removed. Text is now always displayed on the screen in a single 17removed. Text is now always displayed on the screen in a single
18consistent direction---left to right---regardless of the underlying 18consistent direction---left to right---regardless of the underlying
19script. Similarly, @kbd{C-f} and @kbd{C-b} always move the text 19script. Similarly, @kbd{C-f} and @kbd{C-b} always move the text
20cursor to the right and left respectively. Also, @key{right} and 20cursor to the right and left respectively. Also, @key{RIGHT} and
21@key{left} are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might 21@key{LEFT} are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might
22expect, rather than moving forward or backward based on the underlying 22expect, rather than moving forward or backward based on the underlying
23``paragraph direction''. 23``paragraph direction''.
24 24
@@ -36,7 +36,7 @@ and/or README file for details.
36 36
37@item 37@item
38The option @code{delete-active-region} has been deleted. When the 38The option @code{delete-active-region} has been deleted. When the
39region is active, typing @key{DEL} or @key{delete} no longer deletes 39region is active, typing @key{DEL} or @key{Delete} no longer deletes
40the text in the region; it deletes a single character instead. 40the text in the region; it deletes a single character instead.
41 41
42@item 42@item
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 3e8129c9d50..bec7774f2a9 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}).
139point (@pxref{Point}). The keyboard commands @kbd{C-f}, @kbd{C-b}, 139point (@pxref{Point}). The keyboard commands @kbd{C-f}, @kbd{C-b},
140@kbd{C-n}, and @kbd{C-p} move point to the right, left, down, and up, 140@kbd{C-n}, and @kbd{C-p} move point to the right, left, down, and up,
141respectively. You can also move point using the @dfn{arrow keys} 141respectively. You can also move point using the @dfn{arrow keys}
142present on most keyboards: @kbd{@key{right}}, @kbd{@key{left}}, 142present on most keyboards: @key{RIGHT}, @key{LEFT},
143@kbd{@key{down}}, and @kbd{@key{up}}; however, many Emacs users find 143@key{DOWN}, and @key{UP}; however, many Emacs users find
144that it is slower to use the arrow keys than the control keys, because 144that it is slower to use the arrow keys than the control keys, because
145you need to move your hand to the area of the keyboard where those 145you need to move your hand to the area of the keyboard where those
146keys are located. 146keys are located.
@@ -156,7 +156,7 @@ keyboard commands that move point in more sophisticated ways.
156@findex forward-char 156@findex forward-char
157Move forward one character (@code{forward-char}). 157Move forward one character (@code{forward-char}).
158 158
159@item @key{right} 159@item @key{RIGHT}
160@kindex RIGHT 160@kindex RIGHT
161@findex right-char 161@findex right-char
162@vindex visual-order-cursor-movement 162@vindex visual-order-cursor-movement
@@ -176,7 +176,7 @@ away, depending on the surrounding bidirectional context.
176@findex backward-char 176@findex backward-char
177Move backward one character (@code{backward-char}). 177Move backward one character (@code{backward-char}).
178 178
179@item @key{left} 179@item @key{LEFT}
180@kindex LEFT 180@kindex LEFT
181@findex left-char 181@findex left-char
182This command (@code{left-char}) behaves like @kbd{C-b}, except it 182This 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
187screen line as appropriate. 187screen line as appropriate.
188 188
189@item C-n 189@item C-n
190@itemx @key{down} 190@itemx @key{DOWN}
191@kindex C-n 191@kindex C-n
192@kindex DOWN 192@kindex DOWN
193@findex next-line 193@findex next-line
@@ -196,7 +196,7 @@ to keep the horizontal position unchanged, so if you start in the
196middle of one line, you move to the middle of the next. 196middle of one line, you move to the middle of the next.
197 197
198@item C-p 198@item C-p
199@itemx @key{up} 199@itemx @key{UP}
200@kindex C-p 200@kindex C-p
201@kindex UP 201@kindex UP
202@findex previous-line 202@findex previous-line
@@ -222,8 +222,8 @@ Move to the end of the line (@code{move-end-of-line}).
222@findex forward-word 222@findex forward-word
223Move forward one word (@code{forward-word}). 223Move forward one word (@code{forward-word}).
224 224
225@item C-@key{right} 225@item C-@key{RIGHT}
226@itemx M-@key{right} 226@itemx M-@key{RIGHT}
227@kindex C-RIGHT 227@kindex C-RIGHT
228@kindex M-RIGHT 228@kindex M-RIGHT
229@findex right-word 229@findex right-word
@@ -236,8 +236,8 @@ right-to-left. @xref{Bidirectional Editing}.
236@findex backward-word 236@findex backward-word
237Move backward one word (@code{backward-word}). 237Move backward one word (@code{backward-word}).
238 238
239@item C-@key{left} 239@item C-@key{LEFT}
240@itemx M-@key{left} 240@itemx M-@key{LEFT}
241@kindex C-LEFT 241@kindex C-LEFT
242@kindex M-LEFT 242@kindex M-LEFT
243@findex left-word 243@findex left-word
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 3c2beae28ef..89b56da7723 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -74,9 +74,9 @@ Similar, but select @var{buffer} in another window
74@item C-x 5 b @var{buffer} @key{RET} 74@item C-x 5 b @var{buffer} @key{RET}
75Similar, but select @var{buffer} in a separate frame 75Similar, but select @var{buffer} in a separate frame
76(@code{switch-to-buffer-other-frame}). 76(@code{switch-to-buffer-other-frame}).
77@item C-x @key{left} 77@item C-x @key{LEFT}
78Select the previous buffer in the buffer list (@code{previous-buffer}). 78Select the previous buffer in the buffer list (@code{previous-buffer}).
79@item C-x @key{right} 79@item C-x @key{RIGHT}
80Select the next buffer in the buffer list (@code{next-buffer}). 80Select the next buffer in the buffer list (@code{next-buffer}).
81@item C-u M-g M-g 81@item C-u M-g M-g
82@itemx C-u M-g g 82@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
110is re-established taking that file name into account (@pxref{Choosing 110is re-established taking that file name into account (@pxref{Choosing
111Modes}). 111Modes}).
112 112
113@kindex C-x @key{left} 113@kindex C-x @key{LEFT}
114@kindex C-x @key{right} 114@kindex C-x @key{RIGHT}
115@findex next-buffer 115@findex next-buffer
116@findex previous-buffer 116@findex previous-buffer
117 For conveniently switching between a few buffers, use the commands 117 For conveniently switching between a few buffers, use the commands
118@kbd{C-x @key{left}} and @kbd{C-x @key{right}}. @kbd{C-x @key{left}} 118@kbd{C-x @key{LEFT}} and @kbd{C-x @key{RIGHT}}. @kbd{C-x @key{LEFT}}
119(@code{previous-buffer}) selects the previous buffer (following the 119(@code{previous-buffer}) selects the previous buffer (following the
120order of most recent selection in the current frame), while @kbd{C-x 120order of most recent selection in the current frame), while @kbd{C-x
121@key{right}} (@code{next-buffer}) moves through buffers in the reverse 121@key{RIGHT}} (@code{next-buffer}) moves through buffers in the reverse
122direction. 122direction.
123 123
124@kindex C-x 4 b 124@kindex C-x 4 b
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 10612de82bb..d9eba2d5a00 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.
35@samp{3}, @samp{=}, and the space character (denoted as @key{SPC}), 35@samp{3}, @samp{=}, and the space character (denoted as @key{SPC}),
36are entered by typing the corresponding key. @dfn{Control 36are entered by typing the corresponding key. @dfn{Control
37characters}, such as @key{RET}, @key{TAB}, @key{DEL}, @key{ESC}, 37characters}, such as @key{RET}, @key{TAB}, @key{DEL}, @key{ESC},
38@key{F1}, @key{Home}, and @key{left}, are also entered this way, as 38@key{F1}, @key{Home}, and @key{LEFT}, are also entered this way, as
39are certain characters found on non-English keyboards 39are certain characters found on non-English keyboards
40(@pxref{International}). 40(@pxref{International}).
41 41
@@ -53,7 +53,7 @@ holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
53to this as @kbd{C-a} for short. Similarly @kbd{@key{META}-a}, or @kbd{M-a} 53to this as @kbd{C-a} for short. Similarly @kbd{@key{META}-a}, or @kbd{M-a}
54for short, is entered by holding down the @key{Alt} key and pressing 54for short, is entered by holding down the @key{Alt} key and pressing
55@kbd{a}. Modifier keys can also be applied to non-alphanumerical 55@kbd{a}. Modifier keys can also be applied to non-alphanumerical
56characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{left}}. 56characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{LEFT}}.
57 57
58@cindex @key{ESC} replacing @key{META} key 58@cindex @key{ESC} replacing @key{META} key
59 You can also type Meta characters using two-character sequences 59 You can also type Meta characters using two-character sequences
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 96f2ef2107c..9b78128d323 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
1795common function keys: 1795common function keys:
1796 1796
1797@table @asis 1797@table @asis
1798@item @code{left}, @code{up}, @code{right}, @code{down} 1798@item @code{LEFT}, @code{UP}, @code{RIGHT}, @code{DOWN}
1799Cursor arrow keys. 1799Cursor arrow keys.
1800 1800
1801@item @code{begin}, @code{end}, @code{home}, @code{next}, @code{prior} 1801@item @code{Begin}, @code{End}, @code{Home}, @code{next}, @code{prior}
1802Other cursor repositioning keys. 1802Other cursor repositioning keys.
1803 1803
1804@item @code{select}, @code{print}, @code{execute}, @code{backtab} 1804@item @code{select}, @code{print}, @code{execute}, @code{backtab}
@@ -1836,8 +1836,8 @@ translates these keys to the corresponding keys in the main keyboard.
1836For example, when @samp{Num Lock} is on, the key labeled @samp{8} on 1836For example, when @samp{Num Lock} is on, the key labeled @samp{8} on
1837the numeric keypad produces @code{kp-8}, which is translated to 1837the numeric keypad produces @code{kp-8}, which is translated to
1838@kbd{8}; when @samp{Num Lock} is off, the same key produces 1838@kbd{8}; when @samp{Num Lock} is off, the same key produces
1839@code{kp-up}, which is translated to @key{up}. If you rebind a key 1839@code{kp-up}, which is translated to @key{UP}. If you rebind a key
1840such as @kbd{8} or @key{up}, it affects the equivalent keypad key too. 1840such as @kbd{8} or @key{UP}, it affects the equivalent keypad key too.
1841However, if you rebind a @samp{kp-} key directly, that won't affect 1841However, if you rebind a @samp{kp-} key directly, that won't affect
1842its non-keypad equivalent. Note that the modified keys are not 1842its non-keypad equivalent. Note that the modified keys are not
1843translated: for instance, if you hold down the @key{META} key while 1843translated: for instance, if you hold down the @key{META} key while
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index 8340d1031ba..b254cfca43e 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.
127 127
128If called with no argument, the command activates a transient mode for 128If called with no argument, the command activates a transient mode for
129adjusting the indentation of the affected lines interactively. While 129adjusting the indentation of the affected lines interactively. While
130this transient mode is active, typing @key{left} or @key{right} 130this transient mode is active, typing @key{LEFT} or @key{RIGHT}
131indents leftward and rightward, respectively, by one space. You can 131indents leftward and rightward, respectively, by one space. You can
132also type @kbd{S-@key{left}} or @kbd{S-@key{right}} to indent leftward 132also type @kbd{S-@key{LEFT}} or @kbd{S-@key{RIGHT}} to indent leftward
133or rightward to the next tab stop (@pxref{Tab Stops}). Typing any 133or rightward to the next tab stop (@pxref{Tab Stops}). Typing any
134other key disables the transient mode, and resumes normal editing. 134other key disables the transient mode, and resumes normal editing.
135 135
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 2f7ea3b4e9b..e3cda04ce51 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -133,7 +133,7 @@ detailed description of these mouse commands.
133 133
134@cindex shift-selection 134@cindex shift-selection
135 Finally, you can set the mark by holding down the shift key while 135 Finally, you can set the mark by holding down the shift key while
136typing certain cursor motion commands (such as @kbd{S-@key{right}}, 136typing certain cursor motion commands (such as @kbd{S-@key{RIGHT}},
137@kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}. 137@kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}.
138It sets the mark at point before moving point, but only if there is no 138It sets the mark at point before moving point, but only if there is no
139active mark set via shift-selection. The mark set by mouse commands 139active mark set via shift-selection. The mark set by mouse commands
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 8951c7dd5ee..a87aff0e135 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
357point (@code{choose-completion}). 357point (@code{choose-completion}).
358 358
359@findex next-completion 359@findex next-completion
360@item @key{right} 360@item @key{RIGHT}
361While in the completion list buffer, this moves point to the following 361While in the completion list buffer, this moves point to the following
362completion alternative (@code{next-completion}). 362completion alternative (@code{next-completion}).
363 363
364@findex previous-completion 364@findex previous-completion
365@item @key{left} 365@item @key{LEFT}
366While in the completion list buffer, this moves point to the previous 366While in the completion list buffer, this moves point to the previous
367completion alternative (@code{previous-completion}). 367completion alternative (@code{previous-completion}).
368@end table 368@end table
@@ -587,11 +587,11 @@ argument into the minibuffer:
587 587
588@table @kbd 588@table @kbd
589@item M-p 589@item M-p
590@itemx @key{up} 590@itemx @key{UP}
591Move to the previous item in the minibuffer history, an earlier 591Move to the previous item in the minibuffer history, an earlier
592argument (@code{previous-history-element}). 592argument (@code{previous-history-element}).
593@item M-n 593@item M-n
594@itemx @key{down} 594@itemx @key{DOWN}
595Move to the next item in the minibuffer history 595Move to the next item in the minibuffer history
596(@code{next-history-element}). 596(@code{next-history-element}).
597@item M-r @var{regexp} @key{RET} 597@item M-r @var{regexp} @key{RET}
@@ -608,11 +608,11 @@ Move to a later item in the minibuffer history that matches
608@kindex DOWN @r{(minibuffer history)} 608@kindex DOWN @r{(minibuffer history)}
609@findex next-history-element 609@findex next-history-element
610@findex previous-history-element 610@findex previous-history-element
611 While in the minibuffer, @kbd{M-p} or @key{up} 611 While in the minibuffer, @kbd{M-p} or @key{UP}
612(@code{previous-history-element}) moves through the minibuffer history 612(@code{previous-history-element}) moves through the minibuffer history
613list, one item at a time. Each @kbd{M-p} fetches an earlier item from 613list, one item at a time. Each @kbd{M-p} fetches an earlier item from
614the history list into the minibuffer, replacing its existing contents. 614the history list into the minibuffer, replacing its existing contents.
615Typing @kbd{M-n} or @key{down} (@code{next-history-element}) moves 615Typing @kbd{M-n} or @key{DOWN} (@code{next-history-element}) moves
616through the minibuffer history list in the opposite direction, 616through the minibuffer history list in the opposite direction,
617fetching later entries into the minibuffer. 617fetching later entries into the minibuffer.
618 618
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index ce6f80618bd..a2813f8b197 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
932@findex comint-previous-input 932@findex comint-previous-input
933@kindex M-p @r{(Shell mode)} 933@kindex M-p @r{(Shell mode)}
934@item M-p 934@item M-p
935@itemx C-@key{up} 935@itemx C-@key{UP}
936Fetch the next earlier old shell command. 936Fetch the next earlier old shell command.
937 937
938@kindex M-n @r{(Shell mode)} 938@kindex M-n @r{(Shell mode)}
939@findex comint-next-input 939@findex comint-next-input
940@item M-n 940@item M-n
941@itemx C-@key{down} 941@itemx C-@key{DOWN}
942Fetch the next later old shell command. 942Fetch the next later old shell command.
943 943
944@kindex M-r @r{(Shell mode)} 944@kindex M-r @r{(Shell mode)}
@@ -975,7 +975,7 @@ buffer. Successive use of @kbd{M-p} fetches successively earlier
975shell commands, each replacing any text that was already present as 975shell commands, each replacing any text that was already present as
976potential shell input. @kbd{M-n} does likewise except that it finds 976potential shell input. @kbd{M-n} does likewise except that it finds
977successively more recent shell commands from the buffer. 977successively more recent shell commands from the buffer.
978@kbd{C-@key{up}} works like @kbd{M-p}, and @kbd{C-@key{down}} like 978@kbd{C-@key{UP}} works like @kbd{M-p}, and @kbd{C-@key{DOWN}} like
979@kbd{M-n}. 979@kbd{M-n}.
980 980
981 The history search command @kbd{M-r} begins an incremental regular 981 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 724f1bc3a0c..6f29e92732c 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.
151 151
152@table @kbd 152@table @kbd
153@item C-c < 153@item C-c <
154@itemx C-c @key{left} 154@itemx C-c @key{LEFT}
155Move left after insertion (@code{picture-movement-left}). 155Move left after insertion (@code{picture-movement-left}).
156@item C-c > 156@item C-c >
157@itemx C-c @key{right} 157@itemx C-c @key{RIGHT}
158Move right after insertion (@code{picture-movement-right}). 158Move right after insertion (@code{picture-movement-right}).
159@item C-c ^ 159@item C-c ^
160@itemx C-c @key{up} 160@itemx C-c @key{UP}
161Move up after insertion (@code{picture-movement-up}). 161Move up after insertion (@code{picture-movement-up}).
162@item C-c . 162@item C-c .
163@itemx C-c @key{down} 163@itemx C-c @key{DOWN}
164Move down after insertion (@code{picture-movement-down}). 164Move down after insertion (@code{picture-movement-down}).
165@item C-c ` 165@item C-c `
166@itemx C-c @key{Home} 166@itemx C-c @key{Home}