* 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 1357d586d7eb9b49a5da5d14ff3e096f897d47f0..8de855df2e344054ee396e30ee60a49f0383f345 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-31  Jan Dj\e,Ad\e(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 9ec0238ff28e904a2ce519eeb9904d83707ca7cf..7410cad0244c8c02244493b4af61be28cc1b9453 100644 (file)
--- 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 ();
 }