[Emacs-diffs] Changes to emacs/lispref/commands.texi [emacs-unicode-2]

[Miles Bader]

Index: emacs/lispref/commands.texi
diff -c emacs/lispref/commands.texi:1.39.2.4 
emacs/lispref/commands.texi:1.39.2.5
*** emacs/lispref/commands.texi:1.39.2.4        Tue Sep 21 09:34:11 2004
--- emacs/lispref/commands.texi Wed Oct 27 05:41:57 2004
***************
*** 360,365 ****
--- 360,368 ----
  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,421 ****
--- 419,429 ----
  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,1521 ****
  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.
  
  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.
  
  @cindex @code{drag-n-drop} event
  @item (drag-n-drop @var{position} @var{files})
--- 1509,1528 ----
  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{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. 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})