From: Kim F. Storm <storm@cua.dk>
Date: Fri, 14 May 2004 23:01:45 +0000 (+0000)
Subject: Undo last change.
X-Git-Tag: ttn-vms-21-2-B4~6218
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a4455b259c891aeb76efe79fc19a43c721856be;p=emacs.git

Undo last change.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index a3fae774431..b9e455a4431 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4249,8 +4249,6 @@ struct input_event last_timer_event;
    run the timer directly instead of queueing a timer-event.
    Now we always run timers directly.  */
 
-static int in_timer_check = 0;
-
 EMACS_TIME
 timer_check (do_it_now)
      int do_it_now;
@@ -4263,11 +4261,6 @@ timer_check (do_it_now)
   EMACS_SET_SECS (nexttime, -1);
   EMACS_SET_USECS (nexttime, -1);
 
-  if (in_timer_check)
-    return nexttime;
-
-  in_timer_check = 1;
-
   /* Always consider the ordinary timers.  */
   timers = Vtimer_list;
   /* Consider the idle timers only if Emacs is idle.  */
@@ -4426,7 +4419,6 @@ timer_check (do_it_now)
 	   return the amount of time to wait before it is ripe.  */
 	{
 	  UNGCPRO;
-	  in_timer_check = 0;
 	  return difference;
 	}
     }
@@ -4434,7 +4426,6 @@ timer_check (do_it_now)
   /* No timers are pending in the future.  */
   /* Return 0 if we generated an event, and -1 if not.  */
   UNGCPRO;
-  in_timer_check = 0;
   return nexttime;
 }