summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2021-10-25 16:49:48 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2021-10-25 16:49:48 +0200
commit8c73e6b0f9acd315a946e01ceb82f86a70b1aeac (patch)
tree8c0bbb661a5b9202f2a5c8b1e1f8c4149082325f /src/emacs.c
parent4143b1d630132bf72c91d33ae5c10e7930e51353 (diff)
downloademacs-8c73e6b0f9acd315a946e01ceb82f86a70b1aeac.tar.gz
emacs-8c73e6b0f9acd315a946e01ceb82f86a70b1aeac.tar.bz2
emacs-8c73e6b0f9acd315a946e01ceb82f86a70b1aeac.zip
Heed the EMACS_IGNORE_TIMERFD environment variable
* src/emacs.c (main): Call init_atimer after setting up the environment so that the EMACS_IGNORE_TIMERFD environment variable is actually heeded.
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