From 5e12e32f7baeae5afcd08964b72cbc99bc291cb6 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Sat, 12 Jun 1993 09:31:25 +0000 Subject: [PATCH] * 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. --- src/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/window.c b/src/window.c index 96606a8aa6d..655515182ce 100644 --- a/src/window.c +++ b/src/window.c @@ -978,8 +978,9 @@ windows, eventually ending up back at the window you started with.\n\ #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;