diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-12-07 17:26:49 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-12-07 17:26:53 +0100 |
| commit | 8b1693f689bff0ccacdd3ec8326a0860b8bc604e (patch) | |
| tree | cb5e3bb186df5fd4de0b97100f74c6eda3ad8b56 /src/emacs.c | |
| parent | 1537a8c86351e3225dcf30dc9402de1a5675fdca (diff) | |
| download | emacs-8b1693f689bff0ccacdd3ec8326a0860b8bc604e.tar.gz | |
Make previous Fkill_emacs change safer
* src/emacs.c (Fkill_emacs): Don't run `kill-emacs-hook' if it's nil.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/emacs.c b/src/emacs.c index fe09c446c38..2a32083ba15 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2365,10 +2365,13 @@ all of which are called before Emacs is actually killed. */ /* Fsignal calls emacs_abort () if it sees that waiting_for_input is set. */ waiting_for_input = 0; - if (noninteractive) - safe_run_hooks (Qkill_emacs_hook); - else - call1 (Qrun_hook_query_error_with_timeout, Qkill_emacs_hook); + if (!NILP (find_symbol_value (Qkill_emacs_hook))) + { + if (noninteractive) + safe_run_hooks (Qkill_emacs_hook); + else + call1 (Qrun_hook_query_error_with_timeout, Qkill_emacs_hook); + } #ifdef HAVE_X_WINDOWS /* Transfer any clipboards we own to the clipboard manager. */ |