===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-window.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -c -r1.65 -r1.66
*** src/usr.bin/tmux/cmd-new-window.c	2016/10/16 22:06:40	1.65
--- src/usr.bin/tmux/cmd-new-window.c	2017/02/03 11:57:27	1.66
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-window.c,v 1.65 2016/10/16 22:06:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 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>
***************
*** 95,101 ****
  
  	to_free = NULL;
  	if (args_has(args, 'c')) {
! 		ft = format_create(item, 0);
  		format_defaults(ft, c, s, NULL, NULL);
  		cwd = to_free = format_expand(ft, args_get(args, 'c'));
  		format_free(ft);
--- 95,101 ----
  
  	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);
***************
*** 143,149 ****
  		if ((template = args_get(args, 'F')) == NULL)
  			template = NEW_WINDOW_TEMPLATE;
  
! 		ft = format_create(item, 0);
  		format_defaults(ft, c, s, wl, NULL);
  
  		cp = format_expand(ft, template);
--- 143,149 ----
  		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);