Mercurial > emacs
changeset 6851:a4cfe12560d0
(Fnext_window, Fprevious_window, Fdisplay_buffer): Test MULTI_FRAME when
handling argument `all_frames'.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 13 Apr 1994 18:04:40 +0000 |
| parents | d2d8b40fb599 |
| children | 5cc78dd8efc3 |
| files | src/window.c |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Wed Apr 13 18:00:37 1994 +0000 +++ b/src/window.c Wed Apr 13 18:04:40 1994 +0000 @@ -869,6 +869,7 @@ if (NILP (minibuf)) minibuf = (minibuf_level ? Qt : Qlambda); +#ifdef MULTI_FRAME /* all_frames == nil doesn't specify which frames to include. Decide which frames it includes. */ if (NILP (all_frames)) @@ -885,6 +886,7 @@ /* Now all_frames is t meaning search all frames, nil meaning search just current frame, or a window, meaning search the frame that window belongs to. */ +#endif /* Do this loop at least once, to get the next window, and perhaps again, if we hit the minibuffer and that is not acceptable. */ @@ -986,6 +988,7 @@ if (NILP (minibuf)) minibuf = (minibuf_level ? Qt : Qlambda); +#ifdef MULTI_FRAME /* all_frames == nil doesn't specify which frames to include. Decide which frames it includes. */ if (NILP (all_frames)) @@ -1002,6 +1005,7 @@ /* Now all_frames is t meaning search all frames, nil meaning search just current frame, or a window, meaning search the frame that window belongs to. */ +#endif /* Do this loop at least once, to get the previous window, and perhaps again, if we hit the minibuffer and that is not acceptable. */ @@ -1707,9 +1711,13 @@ && XBUFFER (XWINDOW (selected_window)->buffer) == XBUFFER (buffer)) return selected_window; +#ifdef MULTI_FRAME /* If pop_up_frames, look for a window showing BUFFER on any visible frame. */ window = Fget_buffer_window (buffer, pop_up_frames ? Qvisible : Qnil); +#else + window = Fget_buffer_window (buffer, Qnil); +#endif if (!NILP (window) && (NILP (not_this_window) || !EQ (window, selected_window))) return window;