Mercurial > emacs
changeset 3621:0576930165ed
(Fscroll_left): Make argument optional.
(Fscroll_right): Ditto.
(Fprevious_window): When changing frames,
use the new frame's minibuffer if any.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 10 Jun 1993 20:08:25 +0000 |
| parents | 219ff1cb76f4 |
| children | 62c03085c0d9 |
| files | src/window.c |
| diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Thu Jun 10 18:46:48 1993 +0000 +++ b/src/window.c Thu Jun 10 20:08:25 1993 +0000 @@ -840,6 +840,9 @@ : Qnil); else if (! EQ (all_frames, Qt)) all_frames = Qnil; + /* Now all_frames is t meaning search all frames, + nil meaning search just current frame, + or a window, meaning search the frame that window belongs to. */ /* Do this loop at least once, to get the next window, and perhaps again, if we hit the minibuffer and that is not acceptable. */ @@ -942,6 +945,9 @@ : Qnil); else if (! EQ (all_frames, Qt)) all_frames = Qnil; + /* Now all_frames is t meaning search all frames, + nil meaning search just current frame, + or a window, meaning search the frame that window belongs to. */ /* Do this loop at least once, to get the previous window, and perhaps again, if we hit the minibuffer and that is not acceptable. */ @@ -970,7 +976,11 @@ met. */ tem = prev_frame (tem, all_frames); #endif - tem = FRAME_ROOT_WINDOW (XFRAME (tem)); + /* If this frame has a minibuffer, find that window first, + because it is conceptually the last window in that frame. */ + tem = FRAME_MINIBUFFER_WINDOW (XFRAME (tem)); + if (NILP (tem)) + tem = FRAME_ROOT_WINDOW (XFRAME (tem)); break; } @@ -2266,7 +2276,7 @@ return Qnil; } -DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 1, 1, "P", +DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 0, 1, "P", "Scroll selected window display ARG columns left.\n\ Default for ARG is window width minus 2.") (arg) @@ -2284,7 +2294,7 @@ + XINT (arg))); } -DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 1, 1, "P", +DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 0, 1, "P", "Scroll selected window display ARG columns right.\n\ Default for ARG is window width minus 2.") (arg)