[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: naming of 26.1 mwheel- user options
From: |
Tak Kunihiro |
Subject: |
Re: naming of 26.1 mwheel- user options |
Date: |
Thu, 01 Mar 2018 21:20:54 +0900 (JST) |
> Mwheel-wheel? Shouldn't it be mouse-wheel?
Thank you to point out! Let me send a patch again, to change names as
below.
[from mwheel-tilt-scroll-p] --> [to mouse-wheel-tilt-scroll]
[from mwheel-flip-direction] --> [to mouse-wheel-flip-direction]
* Commit log
Change name 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. Suggested by Glenn Morris <address@hidden> in
address@hidden
* lisp/mwheel.el (mouse-wheel-tilt-scroll):
(mouse-wheel-flip-direction):
* etc/NEWS:
* doc/emacs/frames.texi (Mouse Commands): Variables are renamed.
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.
address@hidden mwheel-tilt-scroll-p
address@hidden mwheel-flip-direction
address@hidden mouse-wheel-tilt-scroll
address@hidden 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
address@hidden turns it on. If you'd like to reverse the
-direction of horizontal scrolling, customize the variable
address@hidden to a address@hidden value.
address@hidden turns it on. If you'd like to reverse
+the direction of horizontal scrolling, customize the variable
address@hidden to a address@hidden value.
@node Word and Line Mouse
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 9718ab8..cba1724 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,13 +324,13 @@ 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
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.