From 8b1693f689bff0ccacdd3ec8326a0860b8bc604e Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 7 Dec 2020 17:26:49 +0100
Subject: [PATCH] Make previous Fkill_emacs change safer

* src/emacs.c (Fkill_emacs): Don't run `kill-emacs-hook' if it's nil.
---
 src/emacs.c | 11 +++++++----
 1 file 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.  */
-- 
2.39.2