Merge branch 'emacs-30' of git.sv.gnu.org:/srv/git/emacs into emacs-30

1 files changed, 7 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 200f244305a..8f689327bea 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -750,14 +750,6 @@ This can now be entered using 'C-x 8 E' in addition to the existing
 ** 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 that might still
-happen to be generated by some old packages (or if 'mouse-wheel-buttons'
-has been set to nil).
-
 ** Xterm Mouse mode
 This mode now emits 'wheel-up/down/right/left' events instead of
 'mouse-4/5/6/7' events for the mouse wheel.
@@ -2274,6 +2266,13 @@ completion candidate.
 * Lisp Changes in Emacs 30.1
 
 +++
+** The 'wheel-up/down/left/right' events are now bound unconditionally.
+The 'mouse-wheel-up/down/left/right-event' variables are thus used only
+to specify the 'mouse-4/5/6/7' events that might still happen to be
+generated by some old packages (or if 'mouse-wheel-buttons' has been set
+to nil).
+
++++
 ** New hook 'hack-dir-local-get-variables-functions'.
 This can be used to provide support for other directory-local settings
 beside '.dir-locals.el'.