===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-window.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** src/usr.bin/tmux/cmd-new-window.c	2017/02/03 11:57:27	1.66
--- src/usr.bin/tmux/cmd-new-window.c	2017/03/08 13:36:12	1.67
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-window.c,v 1.66 2017/02/03 11:57:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-new-window.c,v 1.67 2017/03/08 13:36:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 59,65 ****
  	const char		*cmd, *path, *template, *cwd, *to_free;
  	char		       **argv, *cause, *cp;
  	int			 argc, detached;
- 	struct format_tree	*ft;
  	struct environ_entry	*envent;
  	struct cmd_find_state	 fs;
  
--- 59,64 ----
***************
*** 95,104 ****
  
  	to_free = NULL;
  	if (args_has(args, 'c')) {
! 		ft = format_create(item, FORMAT_NONE, 0);
! 		format_defaults(ft, c, s, NULL, NULL);
! 		cwd = to_free = format_expand(ft, args_get(args, 'c'));
! 		format_free(ft);
  	} else if (item->client != NULL && item->client->session == NULL)
  		cwd = item->client->cwd;
  	else
--- 94,101 ----
  
  	to_free = NULL;
  	if (args_has(args, 'c')) {
! 		cwd = args_get(args, 'c');
! 		to_free = cwd = format_single(item, cwd, c, s, NULL, NULL);
  	} else if (item->client != NULL && item->client->session == NULL)
  		cwd = item->client->cwd;
  	else
***************
*** 142,156 ****
  	if (args_has(args, 'P')) {
  		if ((template = args_get(args, 'F')) == NULL)
  			template = NEW_WINDOW_TEMPLATE;
! 
! 		ft = format_create(item, FORMAT_NONE, 0);
! 		format_defaults(ft, c, s, wl, NULL);
! 
! 		cp = format_expand(ft, template);
  		cmdq_print(item, "%s", cp);
  		free(cp);
- 
- 		format_free(ft);
  	}
  
  	if (to_free != NULL)
--- 139,147 ----
  	if (args_has(args, 'P')) {
  		if ((template = args_get(args, 'F')) == NULL)
  			template = NEW_WINDOW_TEMPLATE;
! 		cp = format_single(item, template, c, s, wl, NULL);
  		cmdq_print(item, "%s", cp);
  		free(cp);
  	}
  
  	if (to_free != NULL)