procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(next_frame, prev_frame): If MINIBUF is a window,

Browse source 
include those frames as candidates which have their focus
redirected to the minibuffer frame.
This commit is contained in:
Gerd Moellmann 2000-07-03 07:51:18 +00:00
parent 2faf048a41
commit 551645f885
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/frame.c
View file

@ -943,22 +943,11 @@ next_frame (frame, minibuf)
}
else if (WINDOWP (minibuf))
{
#if 0 /* I don't think the test for frame focus redirection is
correct. This excludes frames "using the current minibuffer"
when their focus isn't redirected, which contradicts the doc
string of next-frame. --gerd, 2000-06-30 */
if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf)
/* Check that F either is, or has forwarded its focus to,
MINIBUF's frame. */
&& (EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
|| EQ (WINDOW_FRAME (XWINDOW (minibuf)),
FRAME_FOCUS_FRAME (XFRAME (f)))))
|| EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
|| EQ (WINDOW_FRAME (XWINDOW (minibuf)),
FRAME_FOCUS_FRAME (XFRAME (f))))
return f;
#else /* not 0 */
if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf)
|| EQ (WINDOW_FRAME (XWINDOW (minibuf)), f))
return f;
#endif /* not 0 */
}
else
return f;
@ -1013,11 +1002,9 @@ prev_frame (frame, minibuf)
else if (WINDOWP (minibuf))
{
if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf)
/* Check that F either is, or has forwarded its focus to,
MINIBUF's frame. */
&& (EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
|| EQ (WINDOW_FRAME (XWINDOW (minibuf)),
FRAME_FOCUS_FRAME (XFRAME (f)))))
|| EQ (WINDOW_FRAME (XWINDOW (minibuf)), f)
|| EQ (WINDOW_FRAME (XWINDOW (minibuf)),
FRAME_FOCUS_FRAME (XFRAME (f))))
prev = f;
}
else if (EQ (minibuf, Qvisible))