# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1084575705 0
# Node ID 2f83cdfb90f66676683a78f1f4446895f15d5375
# Parent  0249aeeeaad6c5078807bfb2dd69dd05c09c551e
Undo last change.

diff -r 0249aeeeaad6 -r 2f83cdfb90f6 src/keyboard.c
--- a/src/keyboard.c	Fri May 14 20:16:06 2004 +0000
+++ b/src/keyboard.c	Fri May 14 23:01:45 2004 +0000
@@ -4249,8 +4249,6 @@
    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 @@
   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 @@
 	   return the amount of time to wait before it is ripe.  */
 	{
 	  UNGCPRO;
-	  in_timer_check = 0;
 	  return difference;
 	}
     }
@@ -4434,7 +4426,6 @@
   /* 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;
 }