[Emacs-diffs] emacs-26 b8bbbe5: Avoid kill-emacs-hook errors hanging batch mode

[Glenn Morris]

branch: emacs-26
commit b8bbbe54ddb7dc49cd28bb03a7f9f1a059501d1e
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Avoid kill-emacs-hook errors hanging batch mode
    
    * src/emacs.c (Fkill_emacs): Prevent errors from kill-emacs-hook
    hanging Emacs in batch mode.  (Bug#29955)
    
    (cherry picked from commit 109da684c5124e22505917fe0255ca66f2a6bfc9)
---
 src/emacs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/emacs.c b/src/emacs.c
index f80047e..7a918b8 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2017,7 +2017,10 @@ 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;
-  run_hook (Qkill_emacs_hook);
+  if (noninteractive)
+    safe_run_hooks (Qkill_emacs_hook);
+  else
+    run_hook (Qkill_emacs_hook);
 
 #ifdef HAVE_X_WINDOWS
   /* Transfer any clipboards we own to the clipboard manager.  */