summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2005-05-04 14:32:34 +0000
committerRichard M. Stallman <rms@gnu.org>2005-05-04 14:32:34 +0000
commit053bc8e49a585a19b3427543f77e17e95d42a1d9 (patch)
treed5961063bbe49d195f98731dc550453039b14b17
parentab3fdfd6343efb09e9fd6c803f586374db432a69 (diff)
downloademacs-053bc8e49a585a19b3427543f77e17e95d42a1d9.tar.gz
(Interactive Codes): Fix Texinfo usage. Document U more clearly.
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/commands.texi17
2 files changed, 15 insertions, 7 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 56f6e87b1d3..34dbb4d46f8 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-04 Richard M. Stallman <rms@gnu.org>
+
+ * commands.texi (Interactive Codes): Fix Texinfo usage.
+ Document U more clearly.
+
2005-05-01 Luc Teirlinck <teirllm@auburn.edu>
* variables.texi (Variable Aliases): `make-obsolete-variable' is a
diff --git a/lispref/commands.texi b/lispref/commands.texi
index 29a86f98632..225deab4a20 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -365,8 +365,9 @@ until a command (or undefined command) is found in the current key
maps. The key sequence argument is represented as a string or vector.
The cursor does not move into the echo area. Prompt.
-If the key sequence is a down-event, the following up-event is discarded,
-but can be read via the @code{U} code character.
+If @samp{k} reads a key sequence that ends with a down-event, it also
+reads and discards the following up-event. You can get access to that
+up-event with the @samp{U} code character.
This kind of input is used by commands such as @code{describe-key} and
@code{global-set-key}.
@@ -425,9 +426,10 @@ the string.) Other characters that normally terminate a symbol (e.g.,
parentheses and brackets) do not do so here. Prompt.
@item U
-A key sequence or @code{nil}. May be used after a @code{k} or @code{K}
-argument to get the up-event that was discarded in case the key
-sequence read for that argument was a down-event. No I/O.
+A key sequence or @code{nil}. Can be used after a @samp{k} or
+@samp{K} argument to get the up-event that was discarded (if any)
+after @samp{k} or @samp{K} read a down-event. If no up-event has been
+discarded, @samp{U} provides @code{nil} as the argument. No I/O.
@item v
A variable declared to be a user option (i.e., satisfying the
@@ -442,8 +444,9 @@ Minibuffer}. Prompt.
@item X
@cindex evaluated expression argument
-A Lisp form is read as with @kbd{x}, but then evaluated so that its
-value becomes the argument for the command. Prompt.
+A Lisp form's value. @samp{X} reads as @samp{x} does, then evaluates
+the form so that its value becomes the argument for the command.
+Prompt.
@item z
A coding system name (a symbol). If the user enters null input, the