[Emacs-diffs] emacs-26 75bb482: Make flymake's mouse-wheel interaction portable (Bug#28732)

[Charles A. Roelli]

branch: emacs-26
commit 75bb4827637111a210c79583f45dd1c5d59a745f
Author: Charles A. Roelli <address@hidden>
Commit: Charles A. Roelli <address@hidden>

    Make flymake's mouse-wheel interaction portable (Bug#28732)
    
    * lisp/progmodes/flymake.el (flymake--mode-line-format): Bind
    'mouse-wheel-down-event' and 'mouse-wheel-up-event' instead of
    'mouse-4' and 'mouse-5'.  Update the tooltip text accordingly, and
    remove a stray newline in it.
---
 lisp/progmodes/flymake.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 3c588f0..1048bc5 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1068,12 +1068,14 @@ applied."
                      keymap
                      ,(let ((map (make-sparse-keymap))
                             (type type))
-                        (define-key map [mode-line mouse-4]
+                        (define-key map (vector 'mode-line
+                                                mouse-wheel-down-event)
                           (lambda (event)
                             (interactive "e")
                             (with-selected-window (posn-window (event-start 
event))
                               (flymake-goto-prev-error 1 (list type) t))))
-                        (define-key map [mode-line mouse-5]
+                        (define-key map (vector 'mode-line
+                                                mouse-wheel-up-event)
                           (lambda (event)
                             (interactive "e")
                             (with-selected-window (posn-window (event-start 
event))
@@ -1086,7 +1088,9 @@ applied."
                                                   'face face)
                                       (propertize (format "%s" type)
                                                   'face face))
-                              "mouse-4/mouse-5: previous/next of this type\n"))
+                              (format "%s/%s: previous/next of this type"
+                                      mouse-wheel-down-event
+                                      mouse-wheel-up-event)))
            into forms
            finally return
            `((:propertize "[")