diff lispref/commands.texi @ 90037:0fe073a08cef

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-65 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-634 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-639 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-640 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-641 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-59 - [e-mail]--gnu-2004/gnus--rel--5.10--patch-60 Update from CVS

--- a/lispref/commands.texi	Tue Oct 26 01:28:28 2004 +0000
+++ b/lispref/commands.texi	Wed Oct 27 05:42:04 2004 +0000
@@ -360,6 +360,9 @@
 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.
+
 This kind of input is used by commands such as @code{describe-key} and
 @code{global-set-key}.
 
@@ -416,6 +419,11 @@
 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 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.
+
 @item v
 A variable declared to be a user option (i.e., satisfying the
 predicate @code{user-variable-p}).  This reads the variable using
@@ -1501,21 +1509,20 @@
 the window manager.  Its standard definition is @code{ignore}; since the
 frame has already been made visible, Emacs has no work to do.
 
-@cindex @code{mouse-wheel} event
-@item (mouse-wheel @var{position} @var{delta})
-This kind of event is generated by moving a wheel on a mouse (such as
-the MS Intellimouse).  Its effect is typically a kind of scroll or zoom.
-
-The element @var{delta} describes the amount and direction of the wheel
-rotation.  Its absolute value is the number of increments by which the
-wheel was rotated.  A negative @var{delta} indicates that the wheel was
-rotated backwards, towards the user, and a positive @var{delta}
-indicates that the wheel was rotated forward, away from the user.
+@cindex @code{wheel-up} event
+@cindex @code{wheel-down} event
+@item (wheel-up @var{position})
+@item (wheel-down @var{position})
+This kind of event is generated by moving a wheel on a mouse.  Its
+effect is typically a kind of scroll or zoom.
 
 The element @var{position} is a list describing the position of the
 event, in the same format as used in a mouse-click event.
 
-This kind of event is generated only on some kinds of systems.
+This kind of event is generated only on some kinds of systems. On
+other systems, mouse-4 and mouse-5 may be used instead.  For portable
+code, the variables @code{mouse-wheel-up-event} and
+@code{mouse-wheel-down-event} defined in @file{mwheel.el} can be used.
 
 @cindex @code{drag-n-drop} event
 @item (drag-n-drop @var{position} @var{files})