aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/commands.texi3
-rw-r--r--doc/emacs/custom.texi6
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 5eb3b304175..a107b8958ba 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -42,6 +42,7 @@ are certain characters found on non-English keyboards
42@cindex C- 42@cindex C-
43@cindex META 43@cindex META
44@cindex M- 44@cindex M-
45@cindex Alt key, serving as Meta
45 Emacs also recognizes control characters that are entered using 46 Emacs also recognizes control characters that are entered using
46@dfn{modifier keys}. Two commonly-used modifier keys are 47@dfn{modifier keys}. Two commonly-used modifier keys are
47@key{Control} (usually labeled @key{Ctrl}), and @key{Meta} (usually 48@key{Control} (usually labeled @key{Ctrl}), and @key{Meta} (usually
@@ -64,6 +65,8 @@ next character; instead, press @key{ESC} and release it, then enter
64the next character. This feature is useful on certain text terminals 65the next character. This feature is useful on certain text terminals
65where the @key{Meta} key does not function reliably. 66where the @key{Meta} key does not function reliably.
66 67
68 Emacs supports 3 additional modifier keys, see @ref{Modifier Keys}.
69
67@cindex keys stolen by window manager 70@cindex keys stolen by window manager
68@cindex window manager, keys stolen by 71@cindex window manager, keys stolen by
69 On graphical displays, the window manager might block some keyboard 72 On graphical displays, the window manager might block some keyboard
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 492e15c2495..d1cbb299c26 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1919,6 +1919,12 @@ characters case-sensitive (even on non-graphical frames) when you
1919customize Emacs. For instance, you could make @kbd{M-a} and @kbd{M-A} 1919customize Emacs. For instance, you could make @kbd{M-a} and @kbd{M-A}
1920run different commands. 1920run different commands.
1921 1921
1922@cindex Alt, modifier key
1923@cindex Super, modifier key
1924@cindex Hyper, modifier key
1925@cindex s-
1926@cindex H-
1927@cindex A-
1922 Although only the @key{Control} and @key{Meta} modifier keys are 1928 Although only the @key{Control} and @key{Meta} modifier keys are
1923commonly used, Emacs supports three other modifier keys. These are 1929commonly used, Emacs supports three other modifier keys. These are
1924called @key{Super}, @key{Hyper}, and @key{Alt}. Few terminals provide 1930called @key{Super}, @key{Hyper}, and @key{Alt}. Few terminals provide