Update environment with -E when attach-session used on an already

attached session or switch-client used on the current session. From Cam
Hutchison.

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