* src/group.c (group_last_window): add argument, the screen to find the

window in. All callers updated.
(group_prev_window): make sure the matched window is in the same
screen as win.
(group_next_window): likewise

* src/window.c (find_window_other): add argument, the screen to
find the window in. All callers updated.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/window.c b/src/window.c
index 8e71afb..a286676 100644
--- a/src/window.c
+++ b/src/window.c
@@ -266,9 +266,9 @@ find_window_next (rp_window *w)
 }
 
 rp_window *
-find_window_other ()
+find_window_other (rp_screen *screen)
 {
-  return group_last_window (rp_current_group);
+  return group_last_window (rp_current_group, screen);
 }
 
 
@@ -652,7 +652,7 @@ get_window_list (char *fmt, char *delim, struct sbuf *buffer,
   if (buffer == NULL) return;
 
   sbuf_clear (buffer);
-  other_window = find_window_other ();
+  other_window = find_window_other (current_screen());
 
   /* We only loop through the current group to look for windows. */
   list_for_each_entry (we,&rp_current_group->mapped_windows,node)