===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- src/usr.bin/tmux/cmd-attach-session.c	2015/06/09 07:07:06	1.37
+++ src/usr.bin/tmux/cmd-attach-session.c	2015/07/06 14:24:57	1.38
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-attach-session.c,v 1.37 2015/06/09 07:07:06 nicm Exp $ */
+/* $OpenBSD: cmd-attach-session.c,v 1.38 2015/07/06 14:24:57 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -124,6 +124,12 @@
 			}
 			close(s->cwd);
 			s->cwd = fd;
+		}
+
+		if (!Eflag) {
+			update = options_get_string(&s->options,
+			    "update-environment");
+			environ_update(update, &c->environ, &s->environ);
 		}
 
 		c->session = s;