===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-session.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** src/usr.bin/tmux/cmd-new-session.c	2017/04/22 10:22:39	1.105
--- src/usr.bin/tmux/cmd-new-session.c	2017/04/22 10:26:44	1.106
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-session.c,v 1.105 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-new-session.c,v 1.106 2017/04/22 10:26:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 83,90 ****
  
  	if (self->entry == &cmd_has_session_entry) {
  		/*
! 		 * cmd_prepare() will fail if the session cannot be found,
! 		 * hence always return success here.
  		 */
  		return (CMD_RETURN_NORMAL);
  	}
--- 83,90 ----
  
  	if (self->entry == &cmd_has_session_entry) {
  		/*
! 		 * cmd_find_target() will fail if the session cannot be found,
! 		 * so always return success here.
  		 */
  		return (CMD_RETURN_NORMAL);
  	}
***************
*** 102,116 ****
  		}
  		if ((as = session_find(newname)) != NULL) {
  			if (args_has(args, 'A')) {
- 				/*
- 				 * This item is now destined for
- 				 * attach-session. Because attach-session will
- 				 * have already been prepared, copy this
- 				 * session into its tflag so it can be used.
- 				 */
- 				cmd_find_from_session(&item->target, as);
  				return (cmd_attach_session(item,
! 				    args_get(args, 't'), args_has(args, 'D'),
  				    0, NULL, args_has(args, 'E')));
  			}
  			cmdq_error(item, "duplicate session: %s", newname);
--- 102,109 ----
  		}
  		if ((as = session_find(newname)) != NULL) {
  			if (args_has(args, 'A')) {
  				return (cmd_attach_session(item,
! 				    newname, args_has(args, 'D'),
  				    0, NULL, args_has(args, 'E')));
  			}
  			cmdq_error(item, "duplicate session: %s", newname);