2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23e7f846274..62d8f3e896d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-25  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+        * mwheel.el (mouse-wheel-mode): Use global-set-key and
+        global-unset-key.
+
 2002-03-24  Richard M. Stallman  <rms@gnu.org>
 
         * mail/rmail.el (rmail-resend): Call mail-abbrev-make-syntax-table.
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index bd99c00fa74..5b04b9ba991 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -169,9 +169,9 @@ Returns non-nil if the new state is enabled."
     (condition-case ()
         (dolist (key keys)
           (cond (mouse-wheel-mode
-                 (define-key (current-global-map) key 'mwheel-scroll))
+                 (global-set-key key 'mwheel-scroll))
                 ((eq (lookup-key (current-global-map) key) 'mwheel-scroll)
-                 (define-key (current-global-map) key nil))))
+                 (global-unset-key key))))
       (error nil))))
 
 ;;; Compatibility entry point