diff options
| author | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
|---|---|---|
| committer | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
| commit | 716d676747119f9950861f9a64a8e7871b0082d4 (patch) | |
| tree | b71f94b50896736a007d6977c97679e1abd895a6 /src/emacs.c | |
| parent | 54ec3973e298c3d2b3d81484f80053d881694f88 (diff) | |
| parent | 7493b4026fc74a51c76c5b614bc83b864af9bc31 (diff) | |
| download | emacs-scratch/pkg.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/pkgscratch/pkg
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index d156b77d950..ee606181d7d 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2918,6 +2918,7 @@ killed. */ if (!NILP (restart)) { + turn_on_atimers (false); #ifdef WINDOWSNT if (w32_reexec_emacs (initial_cmdline, initial_wd) < 0) #else |