From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 31 Oct 2004 12:25:46 +0000 (+0000)
Subject: * atimer.c (alarm_signal_handler): Do not call set_alarm if
X-Git-Tag: ttn-vms-21-2-B4~4305
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fcdb28b473b74bd2a2d79675280764d3abde0659;p=emacs.git

* atimer.c (alarm_signal_handler): Do not call set_alarm if
pending_atmers is non-zero.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1357d586d7e..8de855df2e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* atimer.c (alarm_signal_handler): Do not call set_alarm if
+	pending_atmers is non-zero.
+
 2004-10-31  Kim F. Storm  <storm@cua.dk>
 
 	* dispnew.c (margin_glyphs_to_reserve): Don't use ncols_scale_factor.
diff --git a/src/atimer.c b/src/atimer.c
index 9ec0238ff28..7410cad0244 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -397,7 +397,8 @@ alarm_signal_handler (signo)
       EMACS_GET_TIME (now);
     }
 
-  set_alarm ();
+  if (! pending_atimers)
+    set_alarm ();
 }