===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- src/usr.bin/tmux/cmd-attach-session.c	2016/10/16 22:06:40	1.65
+++ src/usr.bin/tmux/cmd-attach-session.c	2017/01/24 20:15:32	1.66
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-attach-session.c,v 1.65 2016/10/16 22:06:40 nicm Exp $ */
+/* $OpenBSD: cmd-attach-session.c,v 1.66 2017/01/24 20:15:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -54,7 +54,6 @@
 	struct client		*c = item->client, *c_loop;
 	struct winlink		*wl = item->state.tflag.wl;
 	struct window_pane	*wp = item->state.tflag.wp;
-	const char		*update;
 	char			*cause, *cwd;
 	struct format_tree	*ft;
 
@@ -95,13 +94,9 @@
 				server_client_detach(c_loop, MSG_DETACH);
 			}
 		}
+		if (!Eflag)
+			environ_update(s->options, c->environ, s->environ);
 
-		if (!Eflag) {
-			update = options_get_string(s->options,
-			    "update-environment");
-			environ_update(update, c->environ, s->environ);
-		}
-
 		c->session = s;
 		server_client_set_key_table(c, NULL);
 		status_timer_start(c);
@@ -116,7 +111,6 @@
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
-
 		if (rflag)
 			c->flags |= CLIENT_READONLY;
 
@@ -127,12 +121,8 @@
 				server_client_detach(c_loop, MSG_DETACH);
 			}
 		}
-
-		if (!Eflag) {
-			update = options_get_string(s->options,
-			    "update-environment");
-			environ_update(update, c->environ, s->environ);
-		}
+		if (!Eflag)
+			environ_update(s->options, c->environ, s->environ);
 
 		c->session = s;
 		server_client_set_key_table(c, NULL);