From: Jason Rumney Date: Mon, 25 Feb 2002 23:21:01 +0000 (+0000) Subject: (mouse-wheel-scroll-amount): Use same definition as X-Git-Tag: ttn-vms-21-2-B4~16470 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3bd7d448e99e7667de44a347154dd8afba8c7703;p=emacs.git (mouse-wheel-scroll-amount): Use same definition as mwheel.el. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa5ea080834..5d5dd768650 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2002-02-25 Jason Rumney + * w32-vars.el (mouse-wheel-scroll-amount): Use same definition as + mwheel.el. + * language/japanese.el (iso-2022-jp-2): Add init-bol flag. 2002-02-25 Andre Spiegel diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index 13fbb4a2810..dc318783030 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el @@ -31,10 +31,28 @@ :version "21.3" :prefix "w32") -(defcustom mouse-wheel-scroll-amount 4 - "*Number of lines to scroll per click of the mouse wheel." - :type 'integer - :group 'w32) +;; mwheel.el should probably be adapted to accept mouse-wheel events +;; then this could go. +(defcustom mouse-wheel-scroll-amount '(5 ((shift) . 1) ((control) . nil)) + "*Amount to scroll windows by when spinning the mouse wheel. +This is actually a cons cell, where the first item is the amount to scroll +on a normal wheel event. The rest is ignored on Windows, see mwheel.el if +you wish to implement modifier keys." + :group 'w32 + :group 'mouse + :type '(cons + (choice :tag "Normal" + (const :tag "Full screen" :value nil) + (integer :tag "Specific # of lines") + (float :tag "Fraction of window")) + (repeat + (cons + (repeat (choice :tag "modifier" (const alt) (const control) (const hyper) + (const meta) (const shift) (const super))) + (choice :tag "scroll amount" + (const :tag "Full screen" :value nil) + (integer :tag "Specific # of lines") + (float :tag "Fraction of window")))))) ;; Redefine the font selection to use the standard W32 dialog (defcustom w32-use-w32-font-dialog t