From 7d3e2c83d4487c306fc77f22c2cc12f5842bd5ae Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 12 May 2017 10:45:38 +0000
Subject: Store copy mode search string in pane so search-again command works
 even if you exit and reenter copy mode (it doesn't remember the position,
 just the search string), suggested by espie@.

---
 format.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index d6bc9ceb..eb61a00a 100644
--- a/format.c
+++ b/format.c
@@ -1376,8 +1376,8 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 
 	format_add(ft, "pane_synchronized", "%d",
 	    !!options_get_number(wp->window->options, "synchronize-panes"));
-	format_add(ft, "pane_search_string", "%s",
-	    window_copy_search_string(wp));
+	if (wp->searchstr != NULL)
+		format_add(ft, "pane_search_string", "%s", wp->searchstr);
 
 	format_add(ft, "pane_tty", "%s", wp->tty);
 	format_add(ft, "pane_pid", "%ld", (long) wp->pid);
-- 
cgit