1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-27 10:54:40 +00:00

(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).
This commit is contained in:
Miles Bader 2002-03-02 08:21:33 +00:00
parent 3bdb7f8087
commit adf953ac72
2 changed files with 14 additions and 4 deletions

View File

@ -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

View File

@ -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,