# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 797796406 0
# Node ID c4ee56df7173b4d8fb1e40f672ebc12f3d1d2677
# Parent  6502c07121b7377d47807a01a97fe8df047b5aac
(Fdisplay_buffer): Search the proper frame when the
current frame is minibuffer-only.

diff -r 6502c07121b7 -r c4ee56df7173 src/window.c
--- a/src/window.c	Thu Apr 13 17:45:06 1995 +0000
+++ b/src/window.c	Thu Apr 13 18:06:46 1995 +0000
@@ -1932,11 +1932,14 @@
 
 #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)))
     {