diff options
author | Jan Djärv <[email protected]> | 2004-10-31 12:25:46 +0000 |
---|---|---|
committer | Jan Djärv <[email protected]> | 2004-10-31 12:25:46 +0000 |
commit | fcdb28b473b74bd2a2d79675280764d3abde0659 (patch) | |
tree | b963fc79ddbacf5ec2d0d8f4d8cd989e1e90340f | |
parent | 67156185a714845d5815edd518165dda5b297bf4 (diff) |
* atimer.c (alarm_signal_handler): Do not call set_alarm if
pending_atmers is non-zero.
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/atimer.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1357d586d7..8de855df2e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-10-31 Jan Dj,Ad(Brv <[email protected]> + + * atimer.c (alarm_signal_handler): Do not call set_alarm if + pending_atmers is non-zero. + 2004-10-31 Kim F. Storm <[email protected]> * dispnew.c (margin_glyphs_to_reserve): Don't use ncols_scale_factor. diff --git a/src/atimer.c b/src/atimer.c index 9ec0238ff2..7410cad024 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 (); } |