procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename some mwheel options, for consistency

Browse source 
* lisp/mwheel.el (mouse-wheel-tilt-scroll)
(mouse-wheel-flip-direction): Rename from mwheel-tilt-scroll-p,
mwheel-flip-direction.
(mwheel-scroll): Update for option renaming.
* doc/emacs/frames.texi (Mouse Commands):
Update for option renaming.
This commit is contained in:
Tak Kunihiro 2018-03-01 20:44:22 -05:00 • committed by Glenn Morris
parent d6e78de50b
commit 3968f72be8
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/emacs/frames.texi
View file

@ -207,13 +207,13 @@ buffers are scrolled. The variable
@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

4
etc/NEWS
View file

@ -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.

12
lisp/mwheel.el
View file

@ -255,13 +255,13 @@ non-Windows systems."
;; 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 @@ the mode if ARG is omitted or nil."
;;; 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