Mercurial > emacs

changeset 57812:938845bec845

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* atimer.c (alarm_signal_handler): Do not call set_alarm if pending_atmers is non-zero.
author Jan Djärv <jan.h.d@swipnet.se>
date Sun, 31 Oct 2004 12:25:46 +0000
parents 61662d4f85c7
children 6cc2262110d2
files src/ChangeLog src/atimer.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Oct 31 08:33:38 2004 +0000
+++ b/src/ChangeLog	Sun Oct 31 12:25:46 2004 +0000
@@ -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.
--- a/src/atimer.c	Sun Oct 31 08:33:38 2004 +0000
+++ b/src/atimer.c	Sun Oct 31 12:25:46 2004 +0000
@@ -397,7 +397,8 @@
       EMACS_GET_TIME (now);
     }
 
-  set_alarm ();
+  if (! pending_atimers)
+    set_alarm ();
 }