aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Janík2002-03-25 11:31:11 +0000
committerPavel Janík2002-03-25 11:31:11 +0000
commit7ad8cd8e23c293aa2ca8000960863de3f5d13e52 (patch)
tree76c143d98eab5b2131066b11e7d8cd296f9d861b
parent2b2ba4ef7f8dc3ba3fda774f602ca966a842d950 (diff)
downloademacs-7ad8cd8e23c293aa2ca8000960863de3f5d13e52.tar.gz
emacs-7ad8cd8e23c293aa2ca8000960863de3f5d13e52.zip
(mouse-wheel-mode): Use global-set-key and global-unset-key.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mwheel.el4
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 @@
12002-03-25 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2
3 * mwheel.el (mouse-wheel-mode): Use global-set-key and
4 global-unset-key.
5
12002-03-24 Richard M. Stallman <rms@gnu.org> 62002-03-24 Richard M. Stallman <rms@gnu.org>
2 7
3 * mail/rmail.el (rmail-resend): Call mail-abbrev-make-syntax-table. 8 * 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."
169 (condition-case () 169 (condition-case ()
170 (dolist (key keys) 170 (dolist (key keys)
171 (cond (mouse-wheel-mode 171 (cond (mouse-wheel-mode
172 (define-key (current-global-map) key 'mwheel-scroll)) 172 (global-set-key key 'mwheel-scroll))
173 ((eq (lookup-key (current-global-map) key) 'mwheel-scroll) 173 ((eq (lookup-key (current-global-map) key) 'mwheel-scroll)
174 (define-key (current-global-map) key nil)))) 174 (global-unset-key key))))
175 (error nil)))) 175 (error nil))))
176 176
177;;; Compatibility entry point 177;;; Compatibility entry point