diff options
author | Karl Heuer <kwzh@gnu.org> | 1995-04-13 18:06:46 +0000 |
---|---|---|
committer | Karl Heuer <kwzh@gnu.org> | 1995-04-13 18:06:46 +0000 |
commit | 7132eac7d0ffe9fbcd69e9d112c7d370b3a6b1d1 (patch) | |
tree | 124e3f88c19fa94a7cc0babe0f048bc9e09f510b /src/window.c | |
parent | 2be92b874827af4296db809c0f396f991aa69a87 (diff) | |
download | emacs-7132eac7d0ffe9fbcd69e9d112c7d370b3a6b1d1.tar.gz |
(Fdisplay_buffer): Search the proper frame when the
current frame is minibuffer-only.
Diffstat (limited to 'src/window.c')
-rw-r--r-- | src/window.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c index daefb968f91..5ada705a351 100644 --- a/src/window.c +++ b/src/window.c @@ -1932,11 +1932,14 @@ Returns the window displaying BUFFER.") #ifdef MULTI_FRAME /* If pop_up_frames, - look for a window showing BUFFER on any visible or iconified frame. */ - window = Fget_buffer_window (buffer, pop_up_frames ? make_number (0) : Qnil); -#else - window = Fget_buffer_window (buffer, Qnil); + look for a window showing BUFFER on any visible or iconified frame. + Otherwise search only the current frame. */ + if (pop_up_frames || last_nonminibuf_frame == 0) + XSETFASTINT (tem, 0); + else #endif + XSETFRAME (tem, last_nonminibuf_frame); + window = Fget_buffer_window (buffer, tem); if (!NILP (window) && (NILP (not_this_window) || !EQ (window, selected_window))) { |