*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09b50baafa9600ce34bf11736092849722d0a37b..17b6dd92502a07bbf12c47ba449d0b9d1d6a34ed 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-04  Jason Rumney  <jasonr@gnu.org>
+
+       * mwheel.el (mwheel-event-button): Translate mouse-wheel events.
+       (mwheel-scroll): Recognize nil scroll amount as documented.
+
+       * term/w32-win.el (mouse-wheel-scroll-line)
+       (mouse-wheel-scroll-screen): Remove.
+       ([mouse-wheel], [C-mouse-wheel], [S-mouse-wheel]): Use mwheel-scroll.
+
+       * w32-vars.el: (mouse-wheel-scroll-amount): Removed.
+
 2002-05-04  Markus Rost  <rost@math.ohio-state.edu>
 
        * emacs-lisp/find-func.el (find-function-search-for-symbol): Bind

diff --git a/src/ChangeLog b/src/ChangeLog
index c88b33d9425fe3d84cec6a85868a203cf230927e..c453a73256d19e3a215731f06e719d808f4f392f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-04  Jason Rumney  <jasonr@gnu.org>
 
+       * keyboard.c (make_lispy_event) <mouse-wheel>: Set count to 1
+       for event-click-count.
+
        * process.c (init_process): Only add server subfeature if we can
        use non-blocking I/O.