aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2004-10-31 12:25:46 +0000
committerJan Djärv2004-10-31 12:25:46 +0000
commitfcdb28b473b74bd2a2d79675280764d3abde0659 (patch)
treeb963fc79ddbacf5ec2d0d8f4d8cd989e1e90340f
parent67156185a714845d5815edd518165dda5b297bf4 (diff)
downloademacs-fcdb28b473b74bd2a2d79675280764d3abde0659.tar.gz
emacs-fcdb28b473b74bd2a2d79675280764d3abde0659.zip
* atimer.c (alarm_signal_handler): Do not call set_alarm if
pending_atmers is non-zero.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/atimer.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1357d586d7e..8de855df2e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-10-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * atimer.c (alarm_signal_handler): Do not call set_alarm if
4 pending_atmers is non-zero.
5
12004-10-31 Kim F. Storm <storm@cua.dk> 62004-10-31 Kim F. Storm <storm@cua.dk>
2 7
3 * dispnew.c (margin_glyphs_to_reserve): Don't use ncols_scale_factor. 8 * 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)
397 EMACS_GET_TIME (now); 397 EMACS_GET_TIME (now);
398 } 398 }
399 399
400 set_alarm (); 400 if (! pending_atimers)
401 set_alarm ();
401} 402}
402 403
403 404