Show
Ignore:
Timestamp:
07/16/06 08:36:52 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/mw32scroll.el

    r4105 r4111  
    228228               (mouse-x (car (cdr mousepos))) 
    229229               (mouse-y (cdr (cdr mousepos))) 
    230                (delta (if (> (nth 5 position) 0) -1 1)) 
    231                (mouse-delta delta) 
     230               (delta (if (eq (mwheel-event-button event) 
     231                              mouse-wheel-down-event) 
     232                          -1 1)) 
    232233               minibuffer params next-window) 
    233234          (setq params (frame-parameters)) 
    …… 
    257258                (enlarge-window delta) 
    258259                (set-mouse-position mouse-frame mouse-x 
    259                                     (+ mouse-y mouse-delta))))) 
     260                                    (+ mouse-y delta))))) 
    260261          (select-window old-window)))) 
    261262 
    …… 
    331332 
    332333(global-set-key [vertical-scroll-bar mouse-1] 'w32-handle-scroll-bar-event) 
    333 (global-set-key [mouse-wheel1] 'w32-handle-mouse-wheel-event) 
    334 (global-set-key [nil mouse-wheel1] 'ignore) 
    335 (global-set-key [mode-line mouse-wheel1] 
    336                'w32-handle-mouse-wheel-mode-line) 
     334(global-set-key [nil wheel-up] 'ignore) 
     335(global-set-key [nil wheel-down] 'ignore) 
     336(global-set-key [mode-line wheel-up] 'w32-handle-mouse-wheel-mode-line) 
     337(global-set-key [mode-line wheel-down] 'w32-handle-mouse-wheel-mode-line) 
    337338 
    338339(provide 'scroll-bar)