martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't accept dead selected_frame in x_connection_closed (bug#80789)

Browse Source 
* src/xterm.c (x_connection_closed): Try to restore frame if the
selected frame is dead. If that fails, abort.
This commit is contained in:
Pip Cet
2026-04-10 10:10:59 +00:00
parent bc0eacca97
commit 708759324e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/xterm.c
View File

@@ -26961,7 +26961,7 @@ For details, see etc/PROBLEMS.\n",
/* The initial "daemon" frame is sometimes not selected by
`delete_frame' when Emacs is a background daemon. */
if (NILP (selected_frame))
if (NILP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)))
x_try_restore_frame ();
unblock_input ();
@@ -26970,7 +26970,8 @@ For details, see etc/PROBLEMS.\n",
terminal caused all frames to vanish. In that case, simply kill
Emacs, since the next redisplay will abort as there is no more
selected frame. (bug#56528) */
if (terminal_list == 0 || NILP (selected_frame))
if (terminal_list == 0 || NILP (selected_frame)
|| !FRAME_LIVE_P (XFRAME (selected_frame)))
Fkill_emacs (make_fixnum (70), Qnil);
totally_unblock_input ();