===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/tmux/cmd-attach-session.c	2009/08/03 14:10:54	1.7
--- src/usr.bin/tmux/cmd-attach-session.c	2009/08/08 21:52:43	1.8
***************
*** 1,4 ****
! /* $OpenBSD: cmd-attach-session.c,v 1.7 2009/08/03 14:10:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-attach-session.c,v 1.8 2009/08/08 21:52:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 29,35 ****
  const struct cmd_entry cmd_attach_session_entry = {
  	"attach-session", "attach",
  	"[-d] " CMD_TARGET_SESSION_USAGE,
!        	CMD_CANTNEST|CMD_STARTSERVER, CMD_CHFLAG('d'),
  	cmd_target_init,
  	cmd_target_parse,
  	cmd_attach_session_exec,
--- 29,35 ----
  const struct cmd_entry cmd_attach_session_entry = {
  	"attach-session", "attach",
  	"[-d] " CMD_TARGET_SESSION_USAGE,
!        	CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, CMD_CHFLAG('d'),
  	cmd_target_init,
  	cmd_target_parse,
  	cmd_attach_session_exec,
***************
*** 43,48 ****
--- 43,49 ----
  	struct cmd_target_data	*data = self->data;
  	struct session		*s;
  	struct client		*c;
+ 	const char		*update;
  	char			*overrides, *cause;
  	u_int			 i;
  
***************
*** 93,98 ****
--- 94,103 ----
  
  		ctx->cmdclient->session = s;
  		server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
+ 
+ 		update = options_get_string(&s->options, "update-environment");
+ 		environ_update(update, &ctx->cmdclient->environ, &s->environ);
+ 
  		server_redraw_client(ctx->cmdclient);
  	}
  	recalculate_sizes();