===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-attach-session.c	2009/11/11 08:00:42	1.9
--- src/usr.bin/tmux/cmd-attach-session.c	2009/11/13 19:53:28	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-attach-session.c,v 1.9 2009/11/11 08:00:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 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>
***************
*** 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,
--- 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,
***************
*** 58,64 ****
  		return (0);
  
  	if (ctx->cmdclient == NULL) {
! 		if (data->chflags & CMD_CHFLAG('d')) {
  			/* 
  			 * Can't use server_write_session in case attaching to
  			 * the same session as currently attached to.
--- 58,64 ----
  		return (0);
  
  	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.
***************
*** 89,95 ****
  			return (-1);
  		}
  
! 		if (data->chflags & CMD_CHFLAG('d'))
  			server_write_session(s, MSG_DETACH, NULL, 0);
  
  		ctx->cmdclient->session = s;
--- 89,95 ----
  			return (-1);
  		}
  
! 		if (cmd_check_flag(data->chflags, 'd'))
  			server_write_session(s, MSG_DETACH, NULL, 0);
  
  		ctx->cmdclient->session = s;