From b298478435c2e32b788566d1fab93dee1b71ff60 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 6 Jul 2015 14:24:57 +0000
Subject: Update environment with -E when attach-session used on an already
 attached session or switch-client used on the current session. From Cam
 Hutchison.

---
 cmd-attach-session.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'cmd-attach-session.c')

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