[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 94ff882: ; * lisp/wheel.el: Rearrange to match ma
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 94ff882: ; * lisp/wheel.el: Rearrange to match master, to reduce merge conflicts |
Date: |
Fri, 2 Mar 2018 15:05:29 -0500 (EST) |
branch: emacs-26
commit 94ff88247d290a3906ac0c438b7a025f865392c9
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
; * lisp/wheel.el: Rearrange to match master, to reduce merge conflicts
No need to merge to master.
---
lisp/mwheel.el | 53 ++++++++++++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 498fcbc..44c4989 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -148,6 +148,20 @@ This can be slightly disconcerting, but some people prefer
it."
:group 'mouse
:type 'boolean)
+;;; For tilt-scroll
+;;;
+(defcustom mouse-wheel-tilt-scroll nil
+ "Enable scroll using tilting mouse wheel."
+ :group 'mouse
+ :type 'boolean
+ :version "26.1")
+
+(defcustom mouse-wheel-flip-direction nil
+ "Swap direction of 'wheel-right and 'wheel-left."
+ :group 'mouse
+ :type 'boolean
+ :version "26.1")
+
(eval-and-compile
(if (fboundp 'event-button)
(fset 'mwheel-event-button 'event-button)
@@ -191,6 +205,18 @@ This can be slightly disconcerting, but some people prefer
it."
(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))
+ 'wheel-left
+ (intern "mouse-6"))
+ "Event used for scrolling left.")
+
+(defvar mouse-wheel-right-event
+ (if (or (featurep 'w32-win) (featurep 'ns-win))
+ 'wheel-right
+ (intern "mouse-7"))
+ "Event used for scrolling right.")
+
(defun mwheel-scroll (event)
"Scroll up or down according to the EVENT.
This should be bound only to mouse buttons 4, 5, 6, and 7 on
@@ -327,33 +353,6 @@ the mode if ARG is omitted or nil."
"Enable mouse wheel support."
(mouse-wheel-mode (if uninstall -1 1)))
-
-;;; For tilt-scroll
-;;;
-(defcustom mouse-wheel-tilt-scroll nil
- "Enable scroll using tilting mouse wheel."
- :group 'mouse
- :type 'boolean
- :version "26.1")
-
-(defcustom mouse-wheel-flip-direction nil
- "Swap direction of 'wheel-right and 'wheel-left."
- :group 'mouse
- :type 'boolean
- :version "26.1")
-
-(defvar mouse-wheel-left-event
- (if (or (featurep 'w32-win) (featurep 'ns-win))
- 'wheel-left
- (intern "mouse-6"))
- "Event used for scrolling left.")
-
-(defvar mouse-wheel-right-event
- (if (or (featurep 'w32-win) (featurep 'ns-win))
- 'wheel-right
- (intern "mouse-7"))
- "Event used for scrolling right.")
-
(provide 'mwheel)
;;; mwheel.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 94ff882: ; * lisp/wheel.el: Rearrange to match master, to reduce merge conflicts,
Glenn Morris <=