=== modified file 'src/frame.c' *** src/frame.c 2013-09-20 15:34:36 +0000 --- src/frame.c 2013-09-28 12:52:08 +0000 *************** *** 1175,1181 **** delete_frame (Lisp_Object frame, Lisp_Object force) { struct frame *f = decode_any_frame (frame); ! struct frame *sf = SELECTED_FRAME (); struct kboard *kb; int minibuffer_selected, is_tooltip_frame; --- 1175,1181 ---- delete_frame (Lisp_Object frame, Lisp_Object force) { struct frame *f = decode_any_frame (frame); ! struct frame *sf; struct kboard *kb; int minibuffer_selected, is_tooltip_frame; *************** *** 1250,1256 **** There is no more chance for errors to prevent it. */ minibuffer_selected = EQ (minibuf_window, selected_window); ! /* Don't let the frame remain selected. */ if (f == sf) { --- 1250,1256 ---- There is no more chance for errors to prevent it. */ minibuffer_selected = EQ (minibuf_window, selected_window); ! sf = SELECTED_FRAME (); /* Don't let the frame remain selected. */ if (f == sf) {