diff options
| author | Jason Rumney | 2002-02-25 23:26:38 +0000 |
|---|---|---|
| committer | Jason Rumney | 2002-02-25 23:26:38 +0000 |
| commit | ed81ee80f55afedad7e85a6b91be52b118b968f4 (patch) | |
| tree | b6e80d96ef4967584c2c7afae63fd36b69da3cfb | |
| parent | 3bd7d448e99e7667de44a347154dd8afba8c7703 (diff) | |
| download | emacs-ed81ee80f55afedad7e85a6b91be52b118b968f4.tar.gz emacs-ed81ee80f55afedad7e85a6b91be52b118b968f4.zip | |
(mouse-wheel-scroll-line): Use car of
mouse-wheel-scroll-amount.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5d5dd768650..dcef57f9da9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2002-02-25 Jason Rumney <jasonr@gnu.org> | 1 | 2002-02-25 Jason Rumney <jasonr@gnu.org> |
| 2 | 2 | ||
| 3 | * term/w32-win.el (mouse-wheel-scroll-line): Use car of | ||
| 4 | mouse-wheel-scroll-amount. | ||
| 5 | |||
| 3 | * w32-vars.el (mouse-wheel-scroll-amount): Use same definition as | 6 | * w32-vars.el (mouse-wheel-scroll-amount): Use same definition as |
| 4 | mwheel.el. | 7 | mwheel.el. |
| 5 | 8 | ||
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 69285ff0017..5e5ebd12123 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el | |||
| @@ -83,13 +83,15 @@ | |||
| 83 | ;; The following definition is used for debugging scroll bar events. | 83 | ;; The following definition is used for debugging scroll bar events. |
| 84 | ;(defun w32-handle-scroll-bar-event (event) (interactive "e") (princ event)) | 84 | ;(defun w32-handle-scroll-bar-event (event) (interactive "e") (princ event)) |
| 85 | 85 | ||
| 86 | ;; mwheel.el should probably be adapted to accept mouse-wheel events | ||
| 87 | ;; then this could go. | ||
| 86 | (defun mouse-wheel-scroll-line (event) | 88 | (defun mouse-wheel-scroll-line (event) |
| 87 | "Scroll the window in which EVENT occurred by `mouse-wheel-scroll-amount'." | 89 | "Scroll the window in which EVENT occurred by `mouse-wheel-scroll-amount'." |
| 88 | (interactive "e") | 90 | (interactive "e") |
| 89 | (condition-case nil | 91 | (condition-case nil |
| 90 | (if (< (car (cdr (cdr event))) 0) | 92 | (if (< (car (cdr (cdr event))) 0) |
| 91 | (scroll-up mouse-wheel-scroll-amount) | 93 | (scroll-up (car mouse-wheel-scroll-amount)) |
| 92 | (scroll-down mouse-wheel-scroll-amount)) | 94 | (scroll-down (car mouse-wheel-scroll-amount))) |
| 93 | (error nil))) | 95 | (error nil))) |
| 94 | 96 | ||
| 95 | ;; for scroll-in-place.el, this way the -scroll-line and -scroll-screen | 97 | ;; for scroll-in-place.el, this way the -scroll-line and -scroll-screen |