[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master dc9188a 1/4: Limit "other window" scrolling to curr
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master dc9188a 1/4: Limit "other window" scrolling to current terminal |
Date: |
Thu, 10 May 2018 19:47:52 -0400 (EDT) |
branch: master
commit dc9188ada522743dd9c9a6658570d9c4973be432
Author: Basil L. Contovounesios <address@hidden>
Commit: Noam Postavsky <address@hidden>
Limit "other window" scrolling to current terminal
* src/window.c (Fother_window_for_scrolling): Limit next-window
search to visible frames on the current terminal. (bug#30207)
---
src/window.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/window.c b/src/window.c
index e6d0280..59c9422 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5709,8 +5709,7 @@ specifies the window. This takes precedence over
&& !NILP (Vminibuf_scroll_window))
window = Vminibuf_scroll_window;
/* If buffer is specified and live, scroll that buffer. */
- else if (!NILP (Vother_window_scroll_buffer)
- && BUFFERP (Vother_window_scroll_buffer)
+ else if (BUFFERP (Vother_window_scroll_buffer)
&& BUFFER_LIVE_P (XBUFFER (Vother_window_scroll_buffer)))
{
window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil);
@@ -5725,11 +5724,8 @@ specifies the window. This takes precedence over
if (EQ (window, selected_window))
/* That didn't get us anywhere; look for a window on another
- visible frame. */
- do
- window = Fnext_window (window, Qnil, Qt);
- while (! FRAME_VISIBLE_P (XFRAME (WINDOW_FRAME (XWINDOW (window))))
- && ! EQ (window, selected_window));
+ visible frame on the current terminal. */
+ window = Fnext_window (window, Qnil, Qvisible);
}
CHECK_LIVE_WINDOW (window);