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

; * lisp/wheel.el: Rearrange to match master, to reduce merge conflicts

Browse source 
No need to merge to master.
This commit is contained in:
Glenn Morris 2018-03-02 15:05:16 -05:00
parent 0213c8bf47
commit 94ff88247d
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
lisp/mwheel.el
View file

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