From c48d09ec8870ac218d6cc2bbec638d59839eda27 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 25 Apr 2017 15:35:10 +0000
Subject: Do not update TERM into config file parsing has finished.

---
 job.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'job.c')

diff --git a/job.c b/job.c
index caf5db52..7065a671 100644
--- a/job.c
+++ b/job.c
@@ -55,7 +55,12 @@ job_run(const char *cmd, struct session *s, const char *cwd,
 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0)
 		return (NULL);
 
-	env = environ_for_session(s);
+	/*
+	 * Do not set TERM during .tmux.conf, it is nice to be able to use
+	 * if-shell to decide on default-terminal based on outside TERM.
+	 */
+	env = environ_for_session(s, !cfg_finished);
+
 	switch (pid = fork()) {
 	case -1:
 		environ_free(env);
-- 
cgit v1.2.3