# HG changeset patch # User Miles Bader # Date 1015057092 0 # Node ID 0f257be5fa6ada13bd430df4d74ce07c21da6d40 # Parent de43922d0921b2f3fd7cf1e8f58d9a28d309e634 (mwheel-scroll): Remove `double' and `triple' from the event-modifiers before looking up in `mouse-wheel-scroll-amount'. If there's no applicable modifiers entry in the alist in `mouse-wheel-scroll-amount', fall back to the default, not to nil (which causes full screen scrolls). diff -r de43922d0921 -r 0f257be5fa6a lisp/mwheel.el --- a/lisp/mwheel.el Sat Mar 02 00:14:09 2002 +0000 +++ b/lisp/mwheel.el Sat Mar 02 08:18:12 2002 +0000 @@ -122,10 +122,12 @@ (prog1 (selected-window) (select-window (mwheel-event-window event))))) - (mods (delete 'click (event-modifiers event))) - (amt (if mods - (cdr (assoc mods (cdr mouse-wheel-scroll-amount))) - (car mouse-wheel-scroll-amount)))) + (mods + (delq 'click (delq 'double (delq 'triple (event-modifiers event))))) + (amt + (or (and mods + (cdr (assoc mods (cdr mouse-wheel-scroll-amount)))) + (car mouse-wheel-scroll-amount)))) (if (floatp amt) (setq amt (1+ (truncate (* amt (window-height)))))) (when (and mouse-wheel-progessive-speed (numberp amt)) ;; When the double-mouse-N comes in, a mouse-N has been executed already,