[Emacs-diffs] trunk r117292: Fix core dump after a dropped X connection.

[Paul Eggert]

------------------------------------------------------------
revno: 117292
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17704
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-09 07:50:57 -0700
message:
  Fix core dump after a dropped X connection.
  
  * sysdep.c (stuff_char): Don't abort merely because the selected frame
  is dead, as we may be shutting down.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/sysdep.c                   sysdep.c-20091113204419-o5vbwnq5f7feedwu-448

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-08 23:41:43 +0000
+++ b/src/ChangeLog     2014-06-09 14:50:57 +0000
@@ -1,3 +1,9 @@
+2014-06-09  Paul Eggert  <address@hidden>
+
+       Fix core dump after a dropped X connection (Bug#17704).
+       * sysdep.c (stuff_char): Don't abort merely because the selected frame
+       is dead, as we may be shutting down.
+
 2014-06-08  Glenn Morris  <address@hidden>
 
        * fileio.c (write-region-inhibit-fsync): Doc tweak.

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2014-06-08 00:35:27 +0000
+++ b/src/sysdep.c      2014-06-09 14:50:57 +0000
@@ -222,7 +222,9 @@
 void
 stuff_char (char c)
 {
-  if (! FRAME_TERMCAP_P (SELECTED_FRAME ()))
+  if (! (FRAMEP (selected_frame)
+        && FRAME_LIVE_P (XFRAME (selected_frame))
+        && FRAME_TERMCAP_P (XFRAME (selected_frame))))
     return;
 
 /* Should perhaps error if in batch mode */