2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 760795f1870..691ce28ee93 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * atimer.c (init_atimer): Also clear stopped_atimers.
+
+        * keyboard.c (init_keyboard) [POLL_FOR_INPUT]: Reset poll_timer.
+
 2009-04-29  Ulrich Mueller  <ulm@gentoo.org>
 
         * lread.c (Vread_circle): New variable.
diff --git a/src/keyboard.c b/src/keyboard.c
index 9f9705d56bf..4a19457d49f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11681,6 +11681,7 @@ init_keyboard ()
     (*keyboard_init_hook) ();
 
 #ifdef POLL_FOR_INPUT
+  poll_timer = NULL;
   poll_suppress_count = 1;
   start_polling ();
 #endif