(init_keyboard) [POLL_FOR_INPUT]: Reset poll_timer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 760795f1870533eb284c6339bdfce3fa7699a154..691ce28ee93863efcd98ca8bce3cfdc26c5a589c 100644 (file)
--- 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 9f9705d56bfe5714f1787a16e800f7cde54e069f..4a19457d49f9e2964608b79081d9b98ee94610a3 100644 (file)
--- 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