summaryrefslogtreecommitdiff
path: root/src/atimer.c
diff options
context:
space:
mode:
authorSteven Tamm <steventamm@mac.com>2004-07-19 04:42:43 +0000
committerSteven Tamm <steventamm@mac.com>2004-07-19 04:42:43 +0000
commite082ac9deb976fa9ea3e09d639191bee9e9d5315 (patch)
tree82a1728cf854c76c67afea7fcd1cc5fc81a44688 /src/atimer.c
parent1204e81c9e8cc713c8d19116873d9d96a9471467 (diff)
downloademacs-e082ac9deb976fa9ea3e09d639191bee9e9d5315.tar.gz
Fixes for Ctrl-G support on carbon, replacing old timeout based polling
with alarm based polling. mac.c (sys_select): Redo sys_select to use alarm-based polling instead of 1 sec timeouts (like solaris). macterm.c (x_make_frame_visible): Comment in polling on frame creation. keyboard.c: Undef SIGIO on Carbon atimer.c (alarm_signal_handler): Call alarm handlers after scheduling. eval.c (Feval): Remove quit_char test process.c (wait_reading_process_input): Remove clearing stdin for select call on process input
Diffstat (limited to 'src/atimer.c')
-rw-r--r--src/atimer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/atimer.c b/src/atimer.c
index 7e78bdad9c0..9ec0238ff28 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -375,7 +375,9 @@ alarm_signal_handler (signo)
t = atimers;
atimers = atimers->next;
+#ifndef MAC_OSX
t->fn (t);
+#endif
if (t->type == ATIMER_CONTINUOUS)
{
@@ -387,6 +389,10 @@ alarm_signal_handler (signo)
t->next = free_atimers;
free_atimers = t;
}
+#ifdef MAC_OSX
+ /* Fix for Ctrl-G. Perhaps this should apply to all platforms. */
+ t->fn (t);
+#endif
EMACS_GET_TIME (now);
}