Changeset 4105

Show
Ignore:
Timestamp:
07/12/06 21:47:58 (2 years ago)
Author:
miyoshi
Message:

* keyboard.c (make_lispy_event<W32_MOUSE_WHEEL_EVENT>): Insert
nil' into the list of the wheel event just before delta' to
suppress errors in describe-key(). Refer to ticket:312.

* mw32scroll.el (w32-handle-mouse-wheel-event): Take the 5th
element for the difference of the mouse position. Refer to
ticket:312.
(w32-handle-mouse-wheel-mode-line): Ditto.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/ChangeLog.Meadow

    r4098 r4105  
     12006-07-12  MIYOSHI Masanori  <miyoshi@meadowy.org> 
     2 
     3        * mw32scroll.el (w32-handle-mouse-wheel-event): Take the 5th 
     4        element for the difference of the mouse position.  Refer to 
     5        ticket:312. 
     6        (w32-handle-mouse-wheel-mode-line): Ditto. 
     7 
    182006-07-01  MIYOSHI Masanori  <miyoshi@meadowy.org> 
    29 
  • trunk/lisp/mw32scroll.el

    r3961 r4105  
    200200             (lines 
    201201              (w32-get-mouse-wheel-scroll-lines 
    202                (nth 4 position))) 
     202               (nth 5 position))) 
    203203             (window-scroll-step (- (window-height window) 
    204204                                    next-screen-context-lines))) 
    205205        (if (not lines) 
    206             (if (< (nth 4 position) 0) 
     206            (if (< (nth 5 position) 0) 
    207207                (setq lines 3) 
    208208              (setq lines -3))) 
     
    228228               (mouse-x (car (cdr mousepos))) 
    229229               (mouse-y (cdr (cdr mousepos))) 
    230                (delta (if (> (nth 4 position) 0) -1 1)) 
     230               (delta (if (> (nth 5 position) 0) -1 1)) 
    231231               (mouse-delta delta) 
    232232               minibuffer params next-window) 
  • trunk/src/ChangeLog.Meadow

    r4104 r4105  
     12006-07-12  MIYOSHI Masanori  <miyoshi@meadowy.org> 
     2 
     3        * keyboard.c (make_lispy_event<W32_MOUSE_WHEEL_EVENT>): Insert 
     4        `nil' into the list of the wheel event just before `delta' to 
     5        suppress errors in describe-key().  Refer to ticket:312. 
     6 
    172006-07-09  YAMAZAKI Katsuhiro <yamazaki-k@mwe.biglobe.ne.jp> 
    28 
    3         * mw32term.c (mw32_destroy_frame_hdc): Don't release main thread 
     9       * mw32term.c (mw32_destroy_frame_hdc): Don't release main thread 
    410        DC, because this function is called between GET_FRAME_HDC 
    511        and RELEASE_FRAME_HDC on main thread. 
     
    2002062006-04-26  Masayuki FUJII  <boochang@m4.kcn.ne.jp> 
    201207 
    202         * mw32term.h: Add the condition related to cygwin for definition of 
    203         RECONVERTSTRING. 
     208        * mw32term.h: Add the condition related to cygwin for definition 
     209        of RECONVERTSTRING. 
    204210 
    2052112006-04-26  Masayuki FUJII  <boochang@m4.kcn.ne.jp> 
  • trunk/src/keyboard.c

    r4079 r4105  
    58305830                        Fcons (Fcons(event->x, event->y), 
    58315831                               Fcons (make_number (event->timestamp), 
    5832                                       Fcons (make_number(delta), Qnil))))); 
     5832                                      Fcons (Qnil, /* suppress errors 
     5833                                                      in describe-key() */ 
     5834                                             Fcons (make_number(delta), 
     5835                                                    Qnil)))))); 
    58335836 
    58345837        /* Always treat mouse wheel events as clicks. */