Mercurial > emacs

comparison src/frame.c @ 12286:723569a0028c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fdelete_frame): Use do_switch_frame directly. (do_switch_frame): No longer static.
author Richard M. Stallman <rms@gnu.org>
date Fri, 16 Jun 1995 23:26:11 +0000
parents fd9043d15414
children 7149fc03ea56
comparison
equal deleted inserted replaced
12285:1aad1cc93e3f 12286:723569a0028c
405 XSETFRAME (frame, f); 405 XSETFRAME (frame, f);
406 Fmodify_frame_parameters (frame, parms); 406 Fmodify_frame_parameters (frame, parms);
407 return frame; 407 return frame;
408 } 408 }
409 409
410 static Lisp_Object 410 Lisp_Object
411 do_switch_frame (frame, no_enter, track) 411 do_switch_frame (frame, no_enter, track)
412 Lisp_Object frame, no_enter; 412 Lisp_Object frame, no_enter;
413 int track; 413 int track;
414 { 414 {
415 /* If FRAME is a switch-frame event, extract the frame we should 415 /* If FRAME is a switch-frame event, extract the frame we should
953 953
954 minibuffer_selected = EQ (minibuf_window, selected_window); 954 minibuffer_selected = EQ (minibuf_window, selected_window);
955 955
956 /* Don't let the frame remain selected. */ 956 /* Don't let the frame remain selected. */
957 if (f == selected_frame) 957 if (f == selected_frame)
958 Fhandle_switch_frame (next_frame (frame, Qt), Qnil); 958 do_switch_frame (next_frame (frame, Qt), Qnil, 0);
959 959
960 /* Don't allow minibuf_window to remain on a deleted frame. */ 960 /* Don't allow minibuf_window to remain on a deleted frame. */
961 if (EQ (f->minibuffer_window, minibuf_window)) 961 if (EQ (f->minibuffer_window, minibuf_window))
962 { 962 {
963 Fset_window_buffer (selected_frame->minibuffer_window, 963 Fset_window_buffer (selected_frame->minibuffer_window,
1246 error ("Attempt to make invisible the sole visible or iconified frame"); 1246 error ("Attempt to make invisible the sole visible or iconified frame");
1247 1247
1248 #if 0 /* This isn't logically necessary, and it can do GC. */ 1248 #if 0 /* This isn't logically necessary, and it can do GC. */
1249 /* Don't let the frame remain selected. */ 1249 /* Don't let the frame remain selected. */
1250 if (XFRAME (frame) == selected_frame) 1250 if (XFRAME (frame) == selected_frame)
1251 Fhandle_switch_frame (next_frame (frame, Qt), Qnil); 1251 do_switch_frame (next_frame (frame, Qt), Qnil, 0)
1252 #endif 1252 #endif
1253 1253
1254 /* Don't allow minibuf_window to remain on a deleted frame. */ 1254 /* Don't allow minibuf_window to remain on a deleted frame. */
1255 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) 1255 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window))
1256 { 1256 {