[Emacs-diffs] Changes to emacs/lisp/mwheel.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/mwheel.el
diff -c emacs/lisp/mwheel.el:1.30.2.1 emacs/lisp/mwheel.el:1.30.2.2
*** emacs/lisp/mwheel.el:1.30.2.1       Fri Apr 16 12:50:08 2004
--- emacs/lisp/mwheel.el        Fri Nov 12 02:52:52 2004
***************
*** 1,6 ****
  ;;; mwheel.el --- Wheel mouse support
  
! ;; Copyright (C) 1998,2000,2001,2002  Free Software Foundation, Inc.
  ;; Maintainer: William M. Perry <address@hidden>
  ;; Keywords: mouse
  
--- 1,6 ----
  ;;; mwheel.el --- Wheel mouse support
  
! ;; Copyright (C) 1998, 2000, 2001, 2002, 2004  Free Software Foundation, Inc.
  ;; Maintainer: William M. Perry <address@hidden>
  ;; Keywords: mouse
  
***************
*** 137,143 ****
                      (integer :tag "Specific # of lines")
                      (float :tag "Fraction of window"))))))
  
! (defcustom mouse-wheel-progessive-speed t
    "If non-nil, the faster the user moves the wheel, the faster the scrolling.
  Note that this has no effect when `mouse-wheel-scroll-amount' specifies
  a \"near full screen\" scroll or when the mouse wheel sends key instead
--- 137,143 ----
                      (integer :tag "Specific # of lines")
                      (float :tag "Fraction of window"))))))
  
! (defcustom mouse-wheel-progressive-speed t
    "If non-nil, the faster the user moves the wheel, the faster the scrolling.
  Note that this has no effect when `mouse-wheel-scroll-amount' specifies
  a \"near full screen\" scroll or when the mouse wheel sends key instead
***************
*** 197,203 ****
        (let ((list-elt mouse-wheel-scroll-amount))
        (while (consp (setq amt (pop list-elt))))))
      (if (floatp amt) (setq amt (1+ (truncate (* amt (window-height))))))
!     (when (and mouse-wheel-progessive-speed (numberp amt))
        ;; When the double-mouse-N comes in, a mouse-N has been executed 
already,
        ;; So by adding things up we get a squaring up (1, 3, 6, 10, 15, ...).
        (setq amt (* amt (event-click-count event))))
--- 197,203 ----
        (let ((list-elt mouse-wheel-scroll-amount))
        (while (consp (setq amt (pop list-elt))))))
      (if (floatp amt) (setq amt (1+ (truncate (* amt (window-height))))))
!     (when (and mouse-wheel-progressive-speed (numberp amt))
        ;; When the double-mouse-N comes in, a mouse-N has been executed 
already,
        ;; So by adding things up we get a squaring up (1, 3, 6, 10, 15, ...).
        (setq amt (* amt (event-click-count event))))
***************
*** 250,254 ****
  
  (provide 'mwheel)
  
! ;;; arch-tag: 50ed00e7-3686-4b7a-8037-fb31aa5c237f
  ;;; mwheel.el ends here
--- 250,254 ----
  
  (provide 'mwheel)
  
! ;; arch-tag: 50ed00e7-3686-4b7a-8037-fb31aa5c237f
  ;;; mwheel.el ends here