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-attach-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-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 5807eefc..f61b5930 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -54,7 +54,6 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag, struct client *c = item->client, *c_loop; struct winlink *wl = item->state.tflag.wl; struct window_pane *wp = item->state.tflag.wp; - const char *update; char *cause, *cwd; struct format_tree *ft; @@ -95,12 +94,8 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag, server_client_detach(c_loop, MSG_DETACH); } } - - if (!Eflag) { - update = options_get_string(s->options, - "update-environment"); - environ_update(update, c->environ, s->environ); - } + if (!Eflag) + environ_update(s->options, c->environ, s->environ); c->session = s; server_client_set_key_table(c, NULL); @@ -116,7 +111,6 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag, free(cause); return (CMD_RETURN_ERROR); } - if (rflag) c->flags |= CLIENT_READONLY; @@ -127,12 +121,8 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag, server_client_detach(c_loop, MSG_DETACH); } } - - if (!Eflag) { - update = options_get_string(s->options, - "update-environment"); - environ_update(update, c->environ, s->environ); - } + if (!Eflag) + environ_update(s->options, c->environ, s->environ); c->session = s; server_client_set_key_table(c, NULL); |