1 files changed, 7 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 7a59c1e40c3..47beb426a15 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1912,8 +1912,13 @@ shut_down_emacs (sig, no_x, stuff)
   term_ntproc ();
 #endif
 
-  check_glyph_memory ();
-  check_message_stack ();
+  /* Do this only if terminating normally, we want glyph matrices
+     etc. in a core dump.  */
+  if (sig && sig != SIGTERM)
+    {
+      check_glyph_memory ();
+      check_message_stack ();
+    }
 
 #ifdef MSDOS
   dos_cleanup ();