Mercurial > emacs

comparison src/xterm.c @ 10921:bf33c9179a6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 e5f13cc95d02
children 3a2547424010
comparison
equal deleted inserted replaced
10920:bb3f9aaf0e46 10921:bf33c9179a6b
4372 FOR_EACH_FRAME (tail, frame) 4372 FOR_EACH_FRAME (tail, frame)
4373 { 4373 {
4374 Lisp_Object minibuf_frame; 4374 Lisp_Object minibuf_frame;
4375 minibuf_frame 4375 minibuf_frame
4376 = WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame)))); 4376 = WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame))));
4377 if (! EQ (frame, minibuf_frame) 4377 if (FRAME_X_P (XFRAME (frame))
4378 && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) 4378 && FRAME_X_P (XFRAME (minibuf_frame))
4379 && ! EQ (frame, minibuf_frame)
4380 && FRAME_X_DISPLAY_INFO (XFRAME (minibuf_frame)) == dpyinfo)
4379 Fdelete_frame (frame, Qt); 4381 Fdelete_frame (frame, Qt);
4380 } 4382 }
4381 4383
4382 /* Now delete all remaining frames on the dead display. 4384 /* Now delete all remaining frames on the dead display.
4383 We are now sure none of these is used as the minibuffer 4385 We are now sure none of these is used as the minibuffer
4384 for another frame that we need to delete. */ 4386 for another frame that we need to delete. */
4385 FOR_EACH_FRAME (tail, frame) 4387 FOR_EACH_FRAME (tail, frame)
4386 if (FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) 4388 if (FRAME_X_P (XFRAME (frame))
4389 && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo)
4387 Fdelete_frame (frame, Qt); 4390 Fdelete_frame (frame, Qt);
4388 4391
4389 x_delete_display (dpyinfo); 4392 x_delete_display (dpyinfo);
4390 4393
4391 if (x_display_list == 0) 4394 if (x_display_list == 0)