Re: naming of 26.1 mwheel- user options

[Tak Kunihiro <tkk@misasa.okayama-u.ac.jp>]

[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]

Let me send a patch again, to change names of two variables and
how two variables are defined, as below.

[from mwheel-tilt-scroll-p]  --> [to mouse-wheel-tilt-scroll]
[from mwheel-flip-direction] --> [to mouse-wheel-flip-direction]
[from (defcustom mwheel-scroll-left-function 'scroll-left)]
   --> [to (defvar mwheel-scroll-left-function 'scroll-left)]
[from (defcustom mwheel-scroll-right-function 'scroll-right)]
   --> [to (defvar mwheel-scroll-right-function 'scroll-right)]


* Commit log

   Change name and definition of variables to be consistent

   Variables mwheel-tilt-scroll-p and mwheel-flip-direction were
   renamed to mouse-wheel-tilt-scroll and mouse-wheel-flip-direction,
   respectively.  Variables mwheel-scroll-left-function and
   mwheel-scroll-right-function that were defined by defcustom are
   defined by defvar.  Suggested by Glenn Morris <rgm@gnu.org> in
   emacs-devel@gnu.org.

   * etc/NEWS:
   * doc/emacs/frames.texi (Mouse Commands):
   * lisp/mwheel.el (mouse-wheel-tilt-scroll):
   (mouse-wheel-flip-direction): Variables are renamed.
   * lisp/mwheel.el (mwheel-scroll-left-function):
   (mwheel-scroll-right-function): Defined as defvar.


[-- Attachment #2: frames.texi.diff --]
[-- Type: application/octet-stream, Size: 975 bytes --]

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 8cc4d64..c07e471 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -207,13 +207,13 @@ Mouse Commands
 @code{mouse-wheel-progressive-speed} determines whether the scroll
 speed is linked to how fast you move the wheel.
 
-@vindex mwheel-tilt-scroll-p
-@vindex mwheel-flip-direction
+@vindex mouse-wheel-tilt-scroll
+@vindex mouse-wheel-flip-direction
 Emacs can also support horizontal scrolling if your mouse's wheel can
 be tilted.  This feature is off by default; the variable
-@code{mwheel-tilt-scroll-p} turns it on.  If you'd like to reverse the
-direction of horizontal scrolling, customize the variable
-@code{mwheel-flip-direction} to a non-@code{nil} value.
+@code{mouse-wheel-tilt-scroll} turns it on.  If you'd like to reverse
+the direction of horizontal scrolling, customize the variable
+@code{mouse-wheel-flip-direction} to a non-@code{nil} value.
 
 
 @node Word and Line Mouse

[-- Attachment #3: mwheel.el.diff --]
[-- Type: application/octet-stream, Size: 2234 bytes --]

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 9718ab8..2e749a9 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -255,13 +255,13 @@ mwheel-scroll
                    ;; Make sure we do indeed scroll to the end of the buffer.
                    (end-of-buffer (while t (funcall mwheel-scroll-up-function)))))
                 ((eq button mouse-wheel-left-event) ; for tilt scroll
-                 (when mwheel-tilt-scroll-p
-                   (funcall (if mwheel-flip-direction
+                 (when mouse-wheel-tilt-scroll
+                   (funcall (if mouse-wheel-flip-direction
                                 mwheel-scroll-right-function
                               mwheel-scroll-left-function) amt)))
                 ((eq button mouse-wheel-right-event) ; for tilt scroll
-                 (when mwheel-tilt-scroll-p
-                   (funcall (if mwheel-flip-direction
+                 (when mouse-wheel-tilt-scroll
+                   (funcall (if mouse-wheel-flip-direction
                                 mwheel-scroll-left-function
                               mwheel-scroll-right-function) amt)))
 		(t (error "Bad binding in mwheel-scroll"))))
@@ -324,29 +324,23 @@ mwheel-install
 
 ;;; For tilt-scroll
 ;;;
-(defcustom mwheel-tilt-scroll-p nil
+(defcustom mouse-wheel-tilt-scroll nil
   "Enable scroll using tilting mouse wheel."
   :group 'mouse
   :type 'boolean
   :version "26.1")
 
-(defcustom mwheel-flip-direction nil
+(defcustom mouse-wheel-flip-direction nil
   "Swap direction of 'wheel-right and 'wheel-left."
   :group 'mouse
   :type 'boolean
   :version "26.1")
 
-(defcustom mwheel-scroll-left-function 'scroll-left
-  "Function that does the job of scrolling left."
-  :group 'mouse
-  :type 'function
-  :version "26.1")
+(defvar mwheel-scroll-left-function 'scroll-left
+  "Function that does the job of scrolling left.")
 
-(defcustom mwheel-scroll-right-function 'scroll-right
-  "Function that does the job of scrolling right."
-  :group 'mouse
-  :type 'function
-  :version "26.1")
+(defvar mwheel-scroll-right-function 'scroll-right
+  "Function that does the job of scrolling right.")
 
 (defvar mouse-wheel-left-event
   (if (or (featurep 'w32-win) (featurep 'ns-win))

[-- Attachment #4: NEWS.diff --]
[-- Type: application/octet-stream, Size: 569 bytes --]

diff --git a/etc/NEWS b/etc/NEWS
index cb4048d..abd0792 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -431,9 +431,9 @@ always restricting the margin to a quarter of the window.
 
 +++
 ** Emacs can scroll horizontally using mouse, touchpad, and trackbar.
-You can enable this by customizing 'mwheel-tilt-scroll-p'.  If you
+You can enable this by customizing 'mouse-wheel-tilt-scroll'.  If you
 want to reverse the direction of the scroll, customize
-'mwheel-flip-direction'.
+'mouse-wheel-flip-direction'.
 
 +++
 ** The default GnuTLS priority string now includes %DUMBFW.