mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(Fprevious_window, Fnext_window): When minibuf = nil,

Browse Source 
accept only the minibuffer window that is currently active.
This commit is contained in:
Richard M. Stallman 1995-07-23 07:11:26 +00:00
parent 3be3c08ef8
commit fbdc1545c3
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/window.c
View File

@ -916,12 +916,17 @@ DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
/* minibuf == nil may or may not include minibuffers.
Decide if it does. */
if (NILP (minibuf))
minibuf = (minibuf_level ? Qt : Qlambda);
minibuf = (minibuf_level ? minibuf_window : Qlambda);
else if (! EQ (minibuf, Qt))
minibuf = Qlambda;
/* Now minibuf can be t => count all minibuffer windows,
lambda => count none of them,
or a specific minibuffer window (the active one) to count. */
#ifdef MULTI_FRAME
/* all_frames == nil doesn't specify which frames to include. */
if (NILP (all_frames))
all_frames = (EQ (minibuf, Qt)
all_frames = (! EQ (minibuf, Qlambda)
? (FRAME_MINIBUF_WINDOW
(XFRAME
(WINDOW_FRAME
@ -994,11 +999,13 @@ DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
}
/* Which windows are acceptible?
Exit the loop and accept this window if
this isn't a minibuffer window, or
we're accepting minibuffer windows, or
this isn't a minibuffer window,
or we're accepting all minibuffer windows,
or this is the active minibuffer and we are accepting that one, or
we've come all the way around and we're back at the original window. */
while (MINI_WINDOW_P (XWINDOW (window))
&& ! EQ (minibuf, Qt)
&& ! EQ (minibuf, window)
&& ! EQ (window, start_window));
return window;
@ -1055,13 +1062,18 @@ DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
/* minibuf == nil may or may not include minibuffers.
Decide if it does. */
if (NILP (minibuf))
minibuf = (minibuf_level ? Qt : Qlambda);
minibuf = (minibuf_level ? minibuf_window : Qlambda);
else if (! EQ (minibuf, Qt))
minibuf = Qlambda;
/* Now minibuf can be t => count all minibuffer windows,
lambda => count none of them,
or a specific minibuffer window (the active one) to count. */
#ifdef MULTI_FRAME
/* all_frames == nil doesn't specify which frames to include.
Decide which frames it includes. */
if (NILP (all_frames))
all_frames = (EQ (minibuf, Qt)
all_frames = (! EQ (minibuf, Qlambda)
? (FRAME_MINIBUF_WINDOW
(XFRAME
(WINDOW_FRAME
@ -1147,14 +1159,16 @@ DEFUN ("previous-window", Fprevious_window, Sprevious_window, 0, 3, 0,
window = tem;
}
}
/* Which windows are acceptable?
/* Which windows are acceptible?
Exit the loop and accept this window if
this isn't a minibuffer window, or
we're accepting minibuffer windows, or
this isn't a minibuffer window,
or we're accepting all minibuffer windows,
or this is the active minibuffer and we are accepting that one, or
we've come all the way around and we're back at the original window. */
while (MINI_WINDOW_P (XWINDOW (window))
&& !EQ (minibuf, Qt)
&& !EQ (window, start_window));
&& ! EQ (minibuf, Qt)
&& ! EQ (minibuf, window)
&& ! EQ (window, start_window));
return window;
}