diff options
author | Eli Zaretskii <[email protected]> | 2014-04-29 17:45:24 +0300 |
---|---|---|
committer | Eli Zaretskii <[email protected]> | 2014-04-29 17:45:24 +0300 |
commit | d7e9a7f87a616abc20ce460e34854807b0cd681d (patch) | |
tree | 41aca6f2d628ff3cc5a3267a1621fc489da75de6 /doc/emacs/custom.texi | |
parent | 2785da249bd881dae503507d22e3ce6f158e519a (diff) |
Fix bug #17362 with inconsistent usage of @key and @kbd, and key names.
doc/emacs/trouble.texi (Quitting, DEL Does Not Delete, Emergency Escape)
(Bug Criteria): Fix usage of @kbd and @key. (Bug#17362)
doc/emacs/text.texi (Words, Pages, Foldout, HTML Mode): Fix usage of @kbd
and @key.
doc/emacs/search.texi (Special Isearch, Regexp Search): Fix usage of @kbd
and @key.
doc/emacs/screen.texi (Echo Area, Menu Bar): Fix usage of @kbd and @key.
doc/emacs/rmail.texi (Rmail Scrolling): Fix usage of @kbd and @key.
doc/emacs/programs.texi (Hungry Delete, Other C Commands): Fix usage of
@kbd and @key.
doc/emacs/picture-xtra.texi (Insert in Picture): Fix usage of @kbd and
@key.
doc/emacs/mule.texi (Unibyte Mode, Bidirectional Editing): Fix usage of
@kbd and @key.
doc/emacs/msdog.texi (Windows Keyboard, Windows Processes): Fix usage of
@kbd and @key.
doc/emacs/msdog-xtra.texi (MS-DOS Keyboard, MS-DOS Printing)
(MS-DOS Processes): Fix usage of @kbd and @key.
doc/emacs/misc.texi (Shell Ring, Printing Package): Fix usage of @kbd and
@key.
doc/emacs/mini.texi (Completion Commands, Minibuffer History): Fix usage
of @kbd and @key.
doc/emacs/kmacro.texi (Keyboard Macro Step-Edit): Fix usage of @kbd and
@key.
doc/emacs/killing.texi (Deletion, Rectangles, CUA Bindings): Fix usage of
@kbd and @key.
doc/emacs/indent.texi (Indentation Commands): Fix usage of @kbd and @key.
doc/emacs/help.texi (Help Mode, Misc Help): Fix usage of @kbd and @key.
doc/emacs/glossary.texi (Glossary): Fix usage of @kbd and @key.
doc/emacs/frames.texi (Speedbar): Fix usage of @kbd and @key.
doc/emacs/files.texi (Misc File Ops, File Name Cache, File Conveniences)
(Filesets): Fix usage of @kbd and @key.
doc/emacs/display.texi (View Mode): Fix usage of @kbd and @key.
doc/emacs/dired.texi (Image-Dired): Fix usage of @kbd and @key.
doc/emacs/custom.texi (Modifier Keys, Function Keys, Named ASCII Chars)
(Init Syntax): Fix usage of @kbd and @key.
doc/emacs/commands.texi (User Input): Fix usage of @kbd and @key.
doc/emacs/calendar.texi (Counting Days, General Calendar): Fix usage of
@kbd and @key.
doc/emacs/building.texi (Threads Buffer): Fix usage of @kbd and @key.
doc/emacs/buffers.texi (Select Buffer, Icomplete): Fix usage of @kbd and
@key.
doc/emacs/basic.texi (Inserting Text, Erasing, Arguments): Fix usage of
@kbd and @key.
Diffstat (limited to 'doc/emacs/custom.texi')
-rw-r--r-- | doc/emacs/custom.texi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index bb02f1e7c9..96f2ef2107 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1766,11 +1766,11 @@ historical. characters case-sensitive when you customize Emacs. For instance, you could make @kbd{M-a} and @kbd{M-A} run different commands. - Although only the @key{Control} and @key{Meta} modifier keys are + Although only the @key{Control} and @key{META} modifier keys are commonly used, Emacs supports three other modifier keys. These are called @key{Super}, @key{Hyper} and @key{Alt}. Few terminals provide ways to use these modifiers; the key labeled @key{Alt} on most -keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The +keyboards usually issues the @key{META} modifier, not @key{Alt}. The standard key bindings in Emacs do not include any characters with these modifiers. However, you can customize Emacs to assign meanings to them. The modifier bits are labeled as @samp{s-}, @samp{H-} and @@ -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 @@ -1860,7 +1860,7 @@ started out as names for certain @acronym{ASCII} control characters, used so often that they have special keys of their own. For instance, @key{TAB} was another name for @kbd{C-i}. Later, users found it convenient to distinguish in Emacs between these keys and the ``same'' -control characters typed with the @key{CTRL} key. Therefore, on most +control characters typed with the @key{Ctrl} key. Therefore, on most modern terminals, they are no longer the same: @key{TAB} is different from @kbd{C-i}. @@ -2187,8 +2187,8 @@ sequences are mandatory. @samp{\C-} can be used as a prefix for a control character, as in @samp{\C-s} for @acronym{ASCII} control-S, and @samp{\M-} can be used as a prefix for -a Meta character, as in @samp{\M-a} for @kbd{Meta-A} or @samp{\M-\C-a} for -@kbd{Control-Meta-A}. +a Meta character, as in @samp{\M-a} for @kbd{@key{META}-A} or +@samp{\M-\C-a} for @kbd{@key{Ctrl}-@key{META}-A}. @xref{Init Non-ASCII}, for information about including non-@acronym{ASCII} in your init file. |