summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2005-05-13 08:45:13 +0000
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2005-05-13 08:45:13 +0000
commit34e1bbc25ec8c93fb8f454715bbd759509a275a6 (patch)
tree33248511bd177f3e884530701e85e7bd365a5d16 /src/emacs.c
parent354344a20a06e2052bc23a4b92ac44af1075cdbe (diff)
downloademacs-34e1bbc25ec8c93fb8f454715bbd759509a275a6.tar.gz
(main) [MAC_OS8]: Call init_atimer before mac_term_init.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c
index ad9c28e7fec..8e38bffc28e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1325,6 +1325,7 @@ main (argc, argv
syms_of_search ();
syms_of_frame ();
+ init_atimer ();
mac_term_init (build_string ("Mac"), NULL, NULL);
init_keyboard ();
#endif
@@ -1350,7 +1351,9 @@ main (argc, argv
#ifdef CLASH_DETECTION
init_filelock ();
#endif
+#ifndef MAC_OS8
init_atimer ();
+#endif
running_asynch_code = 0;
/* Handle --unibyte and the EMACS_UNIBYTE envvar,