2 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c031af2f684..1c033509e6b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo
+        previous change.
+
+        * startup.el (command-line): Use `custom-reevaluate-setting' for
+        mouse-wheel-down-event and mouse-wheel-up-event.
+
 2005-11-04  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-buffer-type): Remove duplicate
diff --git a/lisp/startup.el b/lisp/startup.el
index 000055f745d..d63e2b99962 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -765,6 +765,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (custom-reevaluate-setting 'blink-cursor-mode)
   (custom-reevaluate-setting 'normal-erase-is-backspace)
   (custom-reevaluate-setting 'tooltip-mode)
+  (custom-reevaluate-setting 'mouse-wheel-down-event)
+  (custom-reevaluate-setting 'mouse-wheel-up-event)
 
   ;; Register default TTY colors for the case the terminal hasn't a
   ;; terminal init file.