diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-07-12 19:47:47 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-07-12 19:47:47 +0100 |
| commit | 28c33f67bc7a93eaf8e6d96a56a88ee023811985 (patch) | |
| tree | 35fbcf8d34e1d88342098fe52701f5ab273dc867 /cmd-attach-session.c | |
| parent | 235e0bd65a49b469d661a9831067e3f745fbbaad (diff) | |
| parent | 9a0ce98c54897f042f4fd3eced6503397f3aa5d2 (diff) | |
| download | rtmux-28c33f67bc7a93eaf8e6d96a56a88ee023811985.tar.gz rtmux-28c33f67bc7a93eaf8e6d96a56a88ee023811985.tar.bz2 rtmux-28c33f67bc7a93eaf8e6d96a56a88ee023811985.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index cb58d4e2..e7cde0f0 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -126,6 +126,12 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, s->cwd = fd; } + if (!Eflag) { + update = options_get_string(&s->options, + "update-environment"); + environ_update(update, &c->environ, &s->environ); + } + c->session = s; notify_attached_session_changed(c); session_update_activity(s); |