(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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index f971abde39d579ae1c153108037363eb2a7d4ad7..76e84ecb888a61ee1bfcbb2ee0a7a58b1a633406 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-02  Miles Bader  <miles@gnu.org>
+
+       * mwheel.el (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).
+
 2002-03-01  Andreas Schwab  <schwab@suse.de>
 
        * textmodes/texnfo-upd.el (texinfo-start-menu-description): Remove

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 4080e7451ed8bf59e38d80ddf4b5b54f31e2df9a..27a487d0ef6021219ed63e7dd8ae9bdddc77ef03 100644 (file)
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -122,10 +122,12 @@ This should only be bound to mouse buttons 4 and 5."
                      (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,