summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-06-12 03:50:31 +0000
committerGlenn Morris <rgm@gnu.org>2008-06-12 03:50:31 +0000
commitfc926716c103e60270cc80ff8be4823d12b2ab21 (patch)
tree7eb587f26cf4867f96b2273224e171b13c2370ec /lisp
parent6b9ebb348af24cdc11c4fa1bbabdd3b4006cf64c (diff)
downloademacs-fc926716c103e60270cc80ff8be4823d12b2ab21.tar.gz
emacs-fc926716c103e60270cc80ff8be4823d12b2ab21.tar.bz2
emacs-fc926716c103e60270cc80ff8be4823d12b2ab21.zip
(mouse-wheel-follow-mouse, mwheel-event-window):
Evaluate definitions when compiling. Reverse tests.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mwheel.el17
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index bab620dc41c..7e38b2e8434 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -1,7 +1,7 @@
;;; mwheel.el --- Wheel mouse support
-;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004, 2005, 2006, 2007,
+;; 2008 Free Software Foundation, Inc.
;; Maintainer: William M. Perry <wmperry@gnu.org>
;; Keywords: mouse
@@ -153,7 +153,9 @@ This can be slightly disconcerting, but some people prefer it."
:group 'mouse
:type 'boolean)
-(if (not (fboundp 'event-button))
+(eval-and-compile
+ (if (fboundp 'event-button)
+ (fset 'mwheel-event-button 'event-button)
(defun mwheel-event-button (event)
(let ((x (event-basic-type event)))
;; Map mouse-wheel events to appropriate buttons
@@ -162,13 +164,12 @@ This can be slightly disconcerting, but some people prefer it."
(if (< amount 0)
mouse-wheel-up-event
mouse-wheel-down-event))
- x)))
- (fset 'mwheel-event-button 'event-button))
+ x))))
-(if (not (fboundp 'event-window))
+ (if (fboundp 'event-window)
+ (fset 'mwheel-event-window 'event-window)
(defun mwheel-event-window (event)
- (posn-window (event-start event)))
- (fset 'mwheel-event-window 'event-window))
+ (posn-window (event-start event)))))
(defvar mwheel-inhibit-click-event-timer nil
"Timer running while mouse wheel click event is inhibited.")