Mercurial > emacs
changeset 10921:bf33c9179a6b
(x_connection_closed): Ignore non-X frames.
Fix the logic for deleting frames that use separate minibuffers
that are on the dead connection.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 06 Mar 1995 04:35:33 +0000 |
| parents | bb3f9aaf0e46 |
| children | 0c3d44805949 |
| files | src/xterm.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Mon Mar 06 04:33:56 1995 +0000 +++ b/src/xterm.c Mon Mar 06 04:35:33 1995 +0000 @@ -4374,8 +4374,10 @@ Lisp_Object minibuf_frame; minibuf_frame = WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame)))); - if (! EQ (frame, minibuf_frame) - && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) + if (FRAME_X_P (XFRAME (frame)) + && FRAME_X_P (XFRAME (minibuf_frame)) + && ! EQ (frame, minibuf_frame) + && FRAME_X_DISPLAY_INFO (XFRAME (minibuf_frame)) == dpyinfo) Fdelete_frame (frame, Qt); } @@ -4383,7 +4385,8 @@ We are now sure none of these is used as the minibuffer for another frame that we need to delete. */ FOR_EACH_FRAME (tail, frame) - if (FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) + if (FRAME_X_P (XFRAME (frame)) + && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) Fdelete_frame (frame, Qt); x_delete_display (dpyinfo);