===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/tmux/Attic/window-choose.c	2015/01/15 13:43:13	1.58
--- src/usr.bin/tmux/Attic/window-choose.c	2015/02/05 10:29:43	1.59
***************
*** 1,4 ****
! /* $OpenBSD: window-choose.c,v 1.58 2015/01/15 13:43:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-choose.c,v 1.59 2015/02/05 10:29:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 919,925 ****
  
  	wcd->ft_template = xstrdup(template);
  	format_add(wcd->ft, "line", "%u", idx);
! 	format_session(wcd->ft, s);
  
  	wcd->command = cmd_template_replace(action, s->name, 1);
  
--- 919,925 ----
  
  	wcd->ft_template = xstrdup(template);
  	format_add(wcd->ft, "line", "%u", idx);
! 	format_defaults(wcd->ft, NULL, s, NULL, NULL);
  
  	wcd->command = cmd_template_replace(action, s->name, 1);
  
***************
*** 946,954 ****
  
  	wcd->ft_template = xstrdup(template);
  	format_add(wcd->ft, "line", "%u", idx);
! 	format_session(wcd->ft, s);
! 	format_winlink(wcd->ft, s, wl);
! 	format_window_pane(wcd->ft, wl->window->active);
  
  	xasprintf(&expanded, "%s:%d", s->name, wl->idx);
  	wcd->command = cmd_template_replace(action, expanded, 1);
--- 946,952 ----
  
  	wcd->ft_template = xstrdup(template);
  	format_add(wcd->ft, "line", "%u", idx);
! 	format_defaults(wcd->ft, NULL, s, wl, NULL);
  
  	xasprintf(&expanded, "%s:%d", s->name, wl->idx);
  	wcd->command = cmd_template_replace(action, expanded, 1);