From d174b9cfcc2d4c60bd89804ef63e5ee41ca6d490 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 7 May 2015 14:07:16 +0000
Subject: [PATCH] Update environment when switching sessions as well as
 attaching, from Si Beaumont.

---
 cmd-switch-client.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index 18de0eb1..369fc917 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -46,7 +46,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct winlink		*wl = NULL;
 	struct window 		*w = NULL;
 	struct window_pane	*wp = NULL;
-	const char		*tflag, *tablename;
+	const char		*tflag, *tablename, *update;
 	struct key_table	*table;
 
 	if ((c = cmd_find_client(cmdq, args_get(args, 'c'), 0)) == NULL)
@@ -119,6 +119,11 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
 		}
 	}
 
+	if (c != NULL && s != c->session) {
+		update = options_get_string(&s->options, "update-environment");
+		environ_update(update, &c->environ, &s->environ);
+	}
+
 	if (c->session != NULL)
 		c->last_session = c->session;
 	c->session = s;