From: nicm <nicm@openbsd.org>
Date: Thu, 7 May 2015 14:07:16 +0000 (+0000)
Subject: Update environment when switching sessions as well as attaching, from Si
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a535bf24a99bb5bf4926c9e75839969ad4118aa0;p=openbsd

Update environment when switching sessions as well as attaching, from Si
Beaumont.
---

diff --git a/usr.bin/tmux/cmd-switch-client.c b/usr.bin/tmux/cmd-switch-client.c
index ddf3e7f54d8..6ada6b3fce9 100644
--- a/usr.bin/tmux/cmd-switch-client.c
+++ b/usr.bin/tmux/cmd-switch-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-switch-client.c,v 1.24 2015/04/25 18:09:28 nicm Exp $ */
+/* $OpenBSD: cmd-switch-client.c,v 1.25 2015/05/07 14:07:16 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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;