diff options
| author | Richard M. Stallman | 1995-06-16 23:26:11 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-06-16 23:26:11 +0000 |
| commit | 61f944833c9ce032faca77ed97fb6c7deb624ec4 (patch) | |
| tree | e59b15e2eec2c57d81b83a72d9c4699541f6d187 /src | |
| parent | 1774d17ed0eee745ad7970af5edb6f6e505642cf (diff) | |
| download | emacs-61f944833c9ce032faca77ed97fb6c7deb624ec4.tar.gz emacs-61f944833c9ce032faca77ed97fb6c7deb624ec4.zip | |
(Fdelete_frame): Use do_switch_frame directly.
(do_switch_frame): No longer static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/frame.c b/src/frame.c index ee7b64eded0..5d9c00c5bc8 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -407,7 +407,7 @@ Note that changing the size of one terminal frame automatically affects all.") | |||
| 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; |
| @@ -955,7 +955,7 @@ but if the second optional argument FORCE is non-nil, you may do so.") | |||
| 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)) |
| @@ -1248,7 +1248,7 @@ but if the second optional argument FORCE is non-nil, you may do so.") | |||
| 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. */ |