# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 739877485 0
# Node ID 01941fa99c9195cad7c4c57113b56c4a5a56a9cc
# Parent  597bde558c91c9b1886a91d2f1c4ab98ed98b1f1
	* window.c (Fprevious_window): Use FRAME_HAS_MINIBUF_P to decide
	if the frame has a minibuffer; FRAME_MINIBUF_WINDOW points to the
	surrogate on minibufferless frames, not nil.

diff -r 597bde558c91 -r 01941fa99c91 src/window.c
--- a/src/window.c	Sat Jun 12 07:26:16 1993 +0000
+++ b/src/window.c	Sat Jun 12 09:31:25 1993 +0000
@@ -978,8 +978,9 @@
 #endif
 	    /* If this frame has a minibuffer, find that window first,
 	       because it is conceptually the last window in that frame.  */
-	    tem = FRAME_MINIBUF_WINDOW (XFRAME (tem));
-	    if (NILP (tem))
+	    if (FRAME_HAS_MINIBUF_P (XFRAME (tem)))
+	      tem = FRAME_MINIBUF_WINDOW (XFRAME (tem));
+	    else
 	      tem = FRAME_ROOT_WINDOW (XFRAME (tem));
 
 	    break;