From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 20 Jan 2024 20:04:12 +0000 (-0500)
Subject: Merge branch 'mwheel-no-alts'
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~2887
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=54d3de64e1902402a8e7dbb2991f360397281a9e;p=emacs.git

Merge branch 'mwheel-no-alts'
---

54d3de64e1902402a8e7dbb2991f360397281a9e
diff --cc etc/NEWS
index 967d8a94113,fefdfb2afb3..8129412e872
--- a/etc/NEWS
+++ b/etc/NEWS
@@@ -412,10 -406,13 +412,17 @@@ respectively, in addition to the existi
  
  * Changes in Specialized Modes and Packages in Emacs 30.1
  
 +---
 +** Trace
 +In batch mode, tracing now sends the trace to stdout.
 +
+ +++
+ ** Mwheel
+ The 'wheel-up/down/left/right' events are now bound unconditionally,
+ and the 'mouse-wheel-up/down/left/right-event' variables are thus
+ used only to specify the 'mouse-4/5/6/7' events generated by
+ legacy setup, such as 'xterm-mouse-mode' or X11 without XInput2.
+ 
  +++
  ** New command 'lldb'.
  Run the LLDB debugger, analogous to the 'gud-gdb' command.