summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index a24543a5862..032b27fcf3c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1872,7 +1872,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
init_bignum ();
init_threads ();
init_eval ();
- init_atimer ();
running_asynch_code = 0;
init_random ();
@@ -2034,6 +2033,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
if (!will_dump_p ())
set_initial_environment ();
+ /* Has to run after the environment is set up. */
+ init_atimer ();
+
#ifdef WINDOWSNT
globals_of_w32 ();
#ifdef HAVE_W32NOTIFY