Merge branch 'obsd-master'

1 files changed, 6 insertions, 1 deletions

diff --git a/job.c b/job.c
index 1ed74e2a..b42a68bc 100644
--- a/job.c
+++ b/job.c
@@ -54,7 +54,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);