[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 3968f72: Rename some mwheel options, for consiste
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 3968f72: Rename some mwheel options, for consistency |
Date: |
Thu, 1 Mar 2018 20:49:46 -0500 (EST) |
branch: emacs-26
commit 3968f72be861b3ee1de590b1ef53f9fb56f3640e
Author: Tak Kunihiro <address@hidden>
Commit: Glenn Morris <address@hidden>
Rename some mwheel options, for consistency
* 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.
---
doc/emacs/frames.texi | 10 +++++-----
etc/NEWS | 4 ++--
lisp/mwheel.el | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 17f6f35..11611e7 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -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.
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/etc/NEWS b/etc/NEWS
index cb4048d..eded00e 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.
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 9718ab8..7107d64 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 3968f72: Rename some mwheel options, for consistency,
Glenn Morris <=