aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-01-20 01:24:33 +0000
committerRichard M. Stallman2006-01-20 01:24:33 +0000
commit2b83bc4334bf7c85c553e67d4c86a86b3379b9b5 (patch)
tree04cc012ef8dfd393b01c63c91729316f9c87ef05
parent2ef0a47ed4c410be45d1e732e7f6c9c747ad4625 (diff)
downloademacs-2b83bc4334bf7c85c553e67d4c86a86b3379b9b5.tar.gz
emacs-2b83bc4334bf7c85c553e67d4c86a86b3379b9b5.zip
(Key Sequence Input): Clarify. Move num-nonmacro-input-events out.
(Reading One Event): num-nonmacro-input-events moved here.
-rw-r--r--lispref/commands.texi17
1 files changed, 10 insertions, 7 deletions
diff --git a/lispref/commands.texi b/lispref/commands.texi
index ed9cb2cf3ca..0d5e8b232ff 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -2074,6 +2074,9 @@ Otherwise, it returns a vector, since a vector can hold all kinds of
2074events---characters, symbols, and lists. The elements of the string or 2074events---characters, symbols, and lists. The elements of the string or
2075vector are the events in the key sequence. 2075vector are the events in the key sequence.
2076 2076
2077Reading a key sequence includes translating the events in various
2078ways. @xref{Translating Input}.
2079
2077The argument @var{prompt} is either a string to be displayed in the 2080The argument @var{prompt} is either a string to be displayed in the
2078echo area as a prompt, or @code{nil}, meaning not to display a prompt. 2081echo area as a prompt, or @code{nil}, meaning not to display a prompt.
2079The argument @var{continue-echo}, if non-@code{nil}, means to echo 2082The argument @var{continue-echo}, if non-@code{nil}, means to echo
@@ -2097,8 +2100,8 @@ key sequence is being read by something that will read commands one
2097after another. It should be @code{nil} if the caller will read just 2100after another. It should be @code{nil} if the caller will read just
2098one key sequence. 2101one key sequence.
2099 2102
2100In the example below, the prompt @samp{?} is displayed in the echo area, 2103In the following example, Emacs displays the prompt @samp{?} in the
2101and the user types @kbd{C-x C-f}. 2104echo area, and then the user types @kbd{C-x C-f}.
2102 2105
2103@example 2106@example
2104(read-key-sequence "?") 2107(read-key-sequence "?")
@@ -2173,11 +2176,6 @@ this Emacs session. This includes key sequences read from the terminal
2173and key sequences read from keyboard macros being executed. 2176and key sequences read from keyboard macros being executed.
2174@end defvar 2177@end defvar
2175 2178
2176@defvar num-nonmacro-input-events
2177This variable holds the total number of input events received so far
2178from the terminal---not counting those generated by keyboard macros.
2179@end defvar
2180
2181@node Reading One Event 2179@node Reading One Event
2182@subsection Reading One Event 2180@subsection Reading One Event
2183@cindex reading a single event 2181@cindex reading a single event
@@ -2265,6 +2263,11 @@ user generates an event which is not a character,
2265gets a character. The arguments work as in @code{read-event}. 2263gets a character. The arguments work as in @code{read-event}.
2266@end defun 2264@end defun
2267 2265
2266@defvar num-nonmacro-input-events
2267This variable holds the total number of input events received so far
2268from the terminal---not counting those generated by keyboard macros.
2269@end defvar
2270
2268@node Invoking the Input Method 2271@node Invoking the Input Method
2269@subsection Invoking the Input Method 2272@subsection Invoking the Input Method
2270 2273