Set mwheel default scroll value to 1 (bug#43380)

* lisp/mwheel.el (mouse-wheel-scroll-amount): Change default value 5 to 1
and shift default value from 1 to 5.
Default value is changed as discussed in etc/TODO.

diff --git a/etc/NEWS b/etc/NEWS
index 5cb31256ff42cb2b04e761b730c048a7c8086623..6a7c99f48d5b8b7cb89254154528e4af54b05b4b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -134,6 +134,10 @@ the mouse cursor is on the scroll bars, fringes, margins, header line,
 and mode line.  ('mwheel-mode' is enabled by default on most graphical
 displays.)
 
+---
+** Mouse wheel scrolling now defaults to one line at a time.
+Old default of five lines at a time is now bound to Shift modifier.
+
 ---
 ** The default value of 'frame-title-format' and 'icon-title-format' has changed.
 These variables are used to display the title bar of visible frames

diff --git a/etc/TODO b/etc/TODO
index 152a29964f3eae16e19187037c5be13179febb42..b445b6736076c9cab1df7c66bc1721e106e1bfbb 100644 (file)
--- a/etc/TODO
+++ b/etc/TODO
@@ -924,17 +924,14 @@ features of that interface could be implemented NS.
 
 **** Smooth scrolling -- maybe not a good idea
 Today, by default, scrolling with a trackpad makes the text move in
-steps of five lines.  (Scrolling with SHIFT scrolls one line at a time.)
+steps of one line.  (Scrolling with SHIFT scrolls five lines at a time.)
 
 The "mac" port provides smooth, pixel-based, scrolling.  This is a very
-popular features.  However, there are drawbacks to this method: what
+popular feature.  However, there are drawbacks to this method: what
 happens if only a fraction of a line is visible at the top of a
 window, is the partially visible text considered part of the window or
 not?  (Technically, what should 'window-start' return.)
 
-An alternative would be to make one-line scrolling the default on NS
-(or in Emacs in general).
-
 Note: This feature might not be allowed to be implemented until also
 implemented in Emacs for a free system.
 

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 32fde0dd058e2b0b45f385ff1a2ebecc6393ada1..0100b8de81e0e3f47339f6de9c443024739f510a 100644 (file)
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -85,7 +85,7 @@ set to the event sent when clicking on the mouse wheel button."
   :type 'number)
 
 (defcustom mouse-wheel-scroll-amount
-  '(5 ((shift) . 1) ((meta) . nil) ((control) . text-scale))
+  '(1 ((shift) . 5) ((meta) . nil) ((control) . text-scale))
   "Amount to scroll windows by when spinning the mouse wheel.
 This is an alist mapping the modifier key to the amount to scroll when
 the wheel is moved with the modifier key depressed.
@@ -125,7 +125,7 @@ scrolling."
                     (float :tag "Scroll fraction of window")
                     (const :tag "Change face size" :value text-scale)))))
   :set 'mouse-wheel-change-button
-  :version "27.1")
+  :version "28.1")
 
 (defcustom mouse-wheel-progressive-speed t
   "If non-nil, the faster the user moves the wheel, the faster the scrolling.