diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-01-24 22:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-01-24 22:01:13 +0000 |
| commit | 418ab1a553f46996d3524bab5c81b2c66fa7efc6 (patch) | |
| tree | b29b61f95da6d7732628cdfb6dcf5e23c2fede5e /cmd-new-session.c | |
| parent | f38a6bbd816533d01d14c8bbafbb51621e5e1326 (diff) | |
| parent | ffc28a7765f4b560427404c9679966232655e67e (diff) | |
| download | rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.gz rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.bz2 rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index 7df7dcb6..10304bc0 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -73,7 +73,7 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) struct window *w; struct environ *env; struct termios tio, *tiop; - const char *newname, *target, *update, *errstr, *template; + const char *newname, *target, *errstr, *template; const char *path, *cmd, *cwd, *to_free = NULL; char **argv, *cause, *cp; int detached, already_attached, idx, argc; @@ -234,11 +234,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) /* Construct the environment. */ env = environ_create(); - if (c != NULL && !args_has(args, 'E')) { - update = options_get_string(global_s_options, - "update-environment"); - environ_update(update, c->environ, env); - } + if (c != NULL && !args_has(args, 'E')) + environ_update(global_s_options, c->environ, env); /* Create the new session. */ idx = -1 - options_get_number(global_s_options, "base-index"); |