From 759efe1b3327a7244c03ecc7b90e0e3c49712d06 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 11 Oct 2021 10:55:30 +0000
Subject: Add -e flag to set environment for popup, from Alexis Hildebrandt in
 GitHub issue 2924.

---
 cmd-run-shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-run-shell.c')

diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index bf43d313..5e914e65 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -188,7 +188,7 @@ cmd_run_shell_timer(__unused int fd, __unused short events, void* arg)
 			cmd_run_shell_free(cdata);
 			return;
 		}
-		if (job_run(cmd, 0, NULL, cdata->s, cdata->cwd, NULL,
+		if (job_run(cmd, 0, NULL, NULL, cdata->s, cdata->cwd, NULL,
 		    cmd_run_shell_callback, cmd_run_shell_free, cdata,
 		    cdata->flags, -1, -1) == NULL)
 			cmd_run_shell_free(cdata);
-- 
cgit 


From cd89000c1d75d0cfec28cf7e81b06f80a43ea093 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 30 May 2022 13:00:18 +0000
Subject: Add a way for lines added to copy mode to be passed through the
 parser to handle escape sequences and use it for run-shell, GitHub issue
 3156.

---
 cmd-run-shell.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'cmd-run-shell.c')

diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index 5e914e65..db5774d2 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -84,22 +84,17 @@ cmd_run_shell_print(struct job *job, const char *msg)
 
 	if (cdata->wp_id != -1)
 		wp = window_pane_find_by_id(cdata->wp_id);
-	if (wp == NULL) {
-		if (cdata->item != NULL) {
-			cmdq_print(cdata->item, "%s", msg);
-			return;
-		}
-		if (cmd_find_from_nothing(&fs, 0) != 0)
-			return;
+	if (wp == NULL && cdata->item != NULL)
+		wp = server_client_get_pane(cdata->client);
+	if (wp == NULL && cmd_find_from_nothing(&fs, 0) == 0)
 		wp = fs.wp;
-		if (wp == NULL)
-			return;
-	}
+	if (wp == NULL)
+		return;
 
 	wme = TAILQ_FIRST(&wp->modes);
 	if (wme == NULL || wme->mode != &window_view_mode)
 		window_pane_set_mode(wp, NULL, &window_view_mode, NULL, NULL);
-	window_copy_add(wp, "%s", msg);
+	window_copy_add(wp, 1, "%s", msg);
 }
 
 static enum cmd_retval
@@ -227,7 +222,8 @@ cmd_run_shell_callback(struct job *job)
 	int				 retcode, status;
 
 	do {
-		if ((line = evbuffer_readline(event->input)) != NULL) {
+		line = evbuffer_readln(event->input, NULL, EVBUFFER_EOL_LF);
+		if (line != NULL) {
 			cmd_run_shell_print(job, line);
 			free(line);
 		}
-- 
cgit 


From 18838fbc877b5c003449fa10df353405c024f0f5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 2 Jun 2022 21:19:32 +0000
Subject: Do not attempt to use client in config file (it will be NULL), GitHub
 issue 3206.

---
 cmd-run-shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-run-shell.c')

diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index db5774d2..560eface 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -84,7 +84,7 @@ cmd_run_shell_print(struct job *job, const char *msg)
 
 	if (cdata->wp_id != -1)
 		wp = window_pane_find_by_id(cdata->wp_id);
-	if (wp == NULL && cdata->item != NULL)
+	if (wp == NULL && cdata->item != NULL && cdata->client != NULL)
 		wp = server_client_get_pane(cdata->client);
 	if (wp == NULL && cmd_find_from_nothing(&fs, 0) == 0)
 		wp = fs.wp;
-- 
cgit