diff options
| author | YAMAMOTO Mitsuharu | 2005-05-13 08:45:13 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2005-05-13 08:45:13 +0000 |
| commit | 34e1bbc25ec8c93fb8f454715bbd759509a275a6 (patch) | |
| tree | 33248511bd177f3e884530701e85e7bd365a5d16 /src | |
| parent | 354344a20a06e2052bc23a4b92ac44af1075cdbe (diff) | |
| download | emacs-34e1bbc25ec8c93fb8f454715bbd759509a275a6.tar.gz emacs-34e1bbc25ec8c93fb8f454715bbd759509a275a6.zip | |
(main) [MAC_OS8]: Call init_atimer before mac_term_init.
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 3 |
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 | |||
| 1325 | syms_of_search (); | 1325 | syms_of_search (); |
| 1326 | syms_of_frame (); | 1326 | syms_of_frame (); |
| 1327 | 1327 | ||
| 1328 | init_atimer (); | ||
| 1328 | mac_term_init (build_string ("Mac"), NULL, NULL); | 1329 | mac_term_init (build_string ("Mac"), NULL, NULL); |
| 1329 | init_keyboard (); | 1330 | init_keyboard (); |
| 1330 | #endif | 1331 | #endif |
| @@ -1350,7 +1351,9 @@ main (argc, argv | |||
| 1350 | #ifdef CLASH_DETECTION | 1351 | #ifdef CLASH_DETECTION |
| 1351 | init_filelock (); | 1352 | init_filelock (); |
| 1352 | #endif | 1353 | #endif |
| 1354 | #ifndef MAC_OS8 | ||
| 1353 | init_atimer (); | 1355 | init_atimer (); |
| 1356 | #endif | ||
| 1354 | running_asynch_code = 0; | 1357 | running_asynch_code = 0; |
| 1355 | 1358 | ||
| 1356 | /* Handle --unibyte and the EMACS_UNIBYTE envvar, | 1359 | /* Handle --unibyte and the EMACS_UNIBYTE envvar, |