===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-window.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -c -r1.86 -r1.87
*** src/usr.bin/tmux/cmd-new-window.c	2020/04/13 14:46:04	1.86
--- src/usr.bin/tmux/cmd-new-window.c	2020/04/13 20:51:57	1.87
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-window.c,v 1.86 2020/04/13 14:46:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-new-window.c,v 1.87 2020/04/13 20:51:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 55,61 ****
  	struct cmd_find_state	*current = cmdq_get_current(item);
  	struct cmd_find_state	*target = cmdq_get_target(item);
  	struct spawn_context	 sc;
! 	struct client		*c = cmd_find_client(item, NULL, 1);
  	struct session		*s = target->s;
  	struct winlink		*wl = target->wl;
  	int			 idx = target->idx;
--- 55,61 ----
  	struct cmd_find_state	*current = cmdq_get_current(item);
  	struct cmd_find_state	*target = cmdq_get_target(item);
  	struct spawn_context	 sc;
! 	struct client		*tc = cmdq_get_target_client(item);
  	struct session		*s = target->s;
  	struct winlink		*wl = target->wl;
  	int			 idx = target->idx;
***************
*** 73,79 ****
  	memset(&sc, 0, sizeof sc);
  	sc.item = item;
  	sc.s = s;
! 	sc.c = c;
  
  	sc.name = args_get(args, 'n');
  	sc.argc = args->argc;
--- 73,79 ----
  	memset(&sc, 0, sizeof sc);
  	sc.item = item;
  	sc.s = s;
! 	sc.tc = tc;
  
  	sc.name = args_get(args, 'n');
  	sc.argc = args->argc;
***************
*** 109,115 ****
  	if (args_has(args, 'P')) {
  		if ((template = args_get(args, 'F')) == NULL)
  			template = NEW_WINDOW_TEMPLATE;
! 		cp = format_single(item, template, c, s, new_wl,
  		    new_wl->window->active);
  		cmdq_print(item, "%s", cp);
  		free(cp);
--- 109,115 ----
  	if (args_has(args, 'P')) {
  		if ((template = args_get(args, 'F')) == NULL)
  			template = NEW_WINDOW_TEMPLATE;
! 		cp = format_single(item, template, tc, s, new_wl,
  		    new_wl->window->active);
  		cmdq_print(item, "%s", cp);
  		free(cp);