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.

---
 job.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'job.c')

diff --git a/job.c b/job.c
index 66a25557..4c13f943 100644
--- a/job.c
+++ b/job.c
@@ -71,7 +71,7 @@ static LIST_HEAD(joblist, job) all_jobs = LIST_HEAD_INITIALIZER(all_jobs);
 
 /* Start a job running. */
 struct job *
-job_run(const char *cmd, int argc, char **argv, struct session *s,
+job_run(const char *cmd, int argc, char **argv, struct environ *e, struct session *s,
     const char *cwd, job_update_cb updatecb, job_complete_cb completecb,
     job_free_cb freecb, void *data, int flags, int sx, int sy)
 {
@@ -89,6 +89,9 @@ job_run(const char *cmd, int argc, char **argv, struct session *s,
 	 * if-shell to decide on default-terminal based on outside TERM.
 	 */
 	env = environ_for_session(s, !cfg_finished);
+	if (e != NULL) {
+		environ_copy(e, env);
+	}
 
 	sigfillset(&set);
 	sigprocmask(SIG_BLOCK, &set, &oldset);
-- 
cgit v1.2.3