From c225262e132ded1b4e1e8c0bd21884e9da78ddb3 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 7 Nov 2019 07:11:25 +0000
Subject: Add -F flag to send-keys to expand formats in search-backward and
 forward copy mode commands, this makes it easier to use the cursor_word and
 cursor_line formats. From Anindya Mukherjee in GitHub issue 1964.

---
 window-copy.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'window-copy.c')

diff --git a/window-copy.c b/window-copy.c
index 473112e3..01dc1f85 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1673,12 +1673,24 @@ window_copy_cmd_search_backward(struct window_copy_cmd_state *cs)
 	struct window_copy_mode_data	*data = wme->data;
 	u_int				 np = wme->prefix;
 	const char			*argument;
+	char				*expanded;
 
 	if (cs->args->argc == 2) {
 		argument = cs->args->argv[1];
 		if (*argument != '\0') {
-			free(data->searchstr);
-			data->searchstr = xstrdup(argument);
+			if (args_has(cs->args, 'F')) {
+				expanded = format_single(NULL, argument, NULL,
+				    NULL, NULL, wme->wp);
+				if (*expanded == '\0') {
+					free(expanded);
+					return (WINDOW_COPY_CMD_NOTHING);
+				}
+				free(data->searchstr);
+				data->searchstr = expanded;
+			} else {
+				free(data->searchstr);
+				data->searchstr = xstrdup(argument);
+			}
 		}
 	}
 	if (data->searchstr != NULL) {
@@ -1696,12 +1708,24 @@ window_copy_cmd_search_forward(struct window_copy_cmd_state *cs)
 	struct window_copy_mode_data	*data = wme->data;
 	u_int				 np = wme->prefix;
 	const char			*argument;
+	char				*expanded;
 
 	if (cs->args->argc == 2) {
 		argument = cs->args->argv[1];
 		if (*argument != '\0') {
-			free(data->searchstr);
-			data->searchstr = xstrdup(argument);
+			if (args_has(cs->args, 'F')) {
+				expanded = format_single(NULL, argument, NULL,
+				    NULL, NULL, wme->wp);
+				if (*expanded == '\0') {
+					free(expanded);
+					return (WINDOW_COPY_CMD_NOTHING);
+				}
+				free(data->searchstr);
+				data->searchstr = expanded;
+			} else {
+				free(data->searchstr);
+				data->searchstr = xstrdup(argument);
+			}
 		}
 	}
 	if (data->searchstr != NULL) {
-- 
cgit