From bba588752f8085da13edcacd71101055bd617303 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 21 Apr 2017 14:01:19 +0000
Subject: Store state shared between multiple commands in the queue in a shared
 structure.

---
 cmd-find.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmd-find.c')

diff --git a/cmd-find.c b/cmd-find.c
index 877af492..ae1ee835 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -998,8 +998,8 @@ cmd_find_target(struct cmd_find_state *fs, struct cmd_find_state *current,
 	if (server_check_marked() && (flags & CMD_FIND_DEFAULT_MARKED)) {
 		fs->current = &marked_pane;
 		log_debug("%s: current is marked pane", __func__);
-	} else if (cmd_find_valid_state(&item->current)) {
-		fs->current = &item->current;
+	} else if (cmd_find_valid_state(&item->shared->current)) {
+		fs->current = &item->shared->current;
 		log_debug("%s: current is from queue", __func__);
 	} else {
 		fs->current = current;
@@ -1015,7 +1015,7 @@ cmd_find_target(struct cmd_find_state *fs, struct cmd_find_state *current,
 
 	/* Mouse target is a plain = or {mouse}. */
 	if (strcmp(target, "=") == 0 || strcmp(target, "{mouse}") == 0) {
-		m = &item->mouse;
+		m = &item->shared->mouse;
 		switch (type) {
 		case CMD_FIND_PANE:
 			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
-- 
cgit 


From c799425069d02675474cda312fac1457829052fb Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 21 Apr 2017 14:09:44 +0000
Subject: More unnecessary arguments now winlink points back to session.

---
 cmd-find.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'cmd-find.c')

diff --git a/cmd-find.c b/cmd-find.c
index ae1ee835..68c15f15 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -895,12 +895,11 @@ cmd_find_from_session(struct cmd_find_state *fs, struct session *s)
 
 /* Find state from a winlink. */
 int
-cmd_find_from_winlink(struct cmd_find_state *fs, struct session *s,
-    struct winlink *wl)
+cmd_find_from_winlink(struct cmd_find_state *fs, struct winlink *wl)
 {
 	cmd_find_clear_state(fs, NULL, 0);
 
-	fs->s = s;
+	fs->s = wl->session;
 	fs->wl = wl;
 	fs->w = wl->window;
 	fs->wp = wl->window->active;
-- 
cgit