===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/tmux/cmd-attach-session.c	2009/11/13 19:53:28	1.10
--- src/usr.bin/tmux/cmd-attach-session.c	2009/12/03 22:50:09	1.11
***************
*** 1,4 ****
! /* $OpenBSD: cmd-attach-session.c,v 1.10 2009/11/13 19:53:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-attach-session.c,v 1.11 2009/12/03 22:50:09 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_SENDENVIRON, "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, "d",
  	cmd_target_init,
  	cmd_target_parse,
  	cmd_attach_session_exec,
***************
*** 59,65 ****
  
  	if (ctx->cmdclient == NULL) {
  		if (cmd_check_flag(data->chflags, 'd')) {
! 			/* 
  			 * Can't use server_write_session in case attaching to
  			 * the same session as currently attached to.
  			 */
--- 59,65 ----
  
  	if (ctx->cmdclient == NULL) {
  		if (cmd_check_flag(data->chflags, 'd')) {
! 			/*
  			 * Can't use server_write_session in case attaching to
  			 * the same session as currently attached to.
  			 */
***************
*** 72,78 ****
  				server_write_client(c, MSG_DETACH, NULL, 0);
  			}
  		}
! 		
  		ctx->curclient->session = s;
  		server_redraw_client(ctx->curclient);
  	} else {
--- 72,78 ----
  				server_write_client(c, MSG_DETACH, NULL, 0);
  			}
  		}
! 
  		ctx->curclient->session = s;
  		server_redraw_client(ctx->curclient);
  	} else {