From 77a5b696bbb4f70e23e94c8a731168a6673c8cd9 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 2 Sep 2020 22:54:47 +0200 Subject: Fix binding mouse wheel with modifiers in buffer area * test/lisp/mwheel-tests.el (mwheel-test--create-scroll-keys): Fix binding mouse wheel with modifiers in buffer area, while ignoring them for fringes, margins, etc. My previous change mistakenly ignored all modifiers in `mouse-wheel-scroll-amount'. * lisp/mwheel.el (mouse-wheel--create-scroll-keys): Fix test to reflect the above. --- lisp/mwheel.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lisp/mwheel.el') diff --git a/lisp/mwheel.el b/lisp/mwheel.el index d5172ba0bf5..53a5a50bada 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -363,8 +363,11 @@ an event used for scrolling, such as `mouse-wheel-down-event'." 'left-fringe 'right-fringe 'vertical-scroll-bar 'horizontal-scroll-bar 'mode-line 'header-line))) - (cons (vector event) ; default case: no prefix. - (when (not (consp binding)) + (if (consp binding) + ;; With modifiers, bind only the buffer area (no prefix). + (list `[(,@(car binding) ,event)]) + ;; No modifier: bind also some non-buffer areas of the screen. + (cons (vector event) (mapcar (lambda (prefix) (vector prefix event)) prefixes))))) (define-minor-mode mouse-wheel-mode -- cgit v1.2.3