Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-25 18:01:11 +01:00
8 changed files with 47 additions and 16 deletions

7
job.c
View File

@ -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);