===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-choose-tree.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/cmd-choose-tree.c	2012/08/11 06:46:47	1.6
--- src/usr.bin/tmux/cmd-choose-tree.c	2012/08/14 08:51:53	1.7
***************
*** 1,4 ****
! /* $OpenBSD: cmd-choose-tree.c,v 1.6 2012/08/11 06:46:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2012 Thomas Adam <thomas@xteddy.org>
--- 1,4 ----
! /* $OpenBSD: cmd-choose-tree.c,v 1.7 2012/08/14 08:51:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2012 Thomas Adam <thomas@xteddy.org>
***************
*** 27,34 ****
  
  #define CMD_CHOOSE_TREE_WINDOW_ACTION "select-window -t '%%'"
  #define CMD_CHOOSE_TREE_SESSION_ACTION "switch-client -t '%%'"
- #define CMD_CHOOSE_TREE_WINDOW_TEMPLATE \
-     DEFAULT_WINDOW_TEMPLATE " \"#{pane_title}\""
  
  /*
   * Enter choice mode to choose a session and/or window.
--- 27,32 ----
***************
*** 104,110 ****
  	if (self->entry == &cmd_choose_session_entry) {
  		sflag = 1;
  		if ((ses_template = args_get(args, 'F')) == NULL)
! 			ses_template = DEFAULT_SESSION_TEMPLATE;
  
  		if (args->argc != 0)
  			ses_action = args->argv[0];
--- 102,108 ----
  	if (self->entry == &cmd_choose_session_entry) {
  		sflag = 1;
  		if ((ses_template = args_get(args, 'F')) == NULL)
! 			ses_template = CHOOSE_TREE_SESSION_TEMPLATE;
  
  		if (args->argc != 0)
  			ses_action = args->argv[0];
***************
*** 113,119 ****
  	} else if (self->entry == &cmd_choose_window_entry) {
  		wflag = 1;
  		if ((win_template = args_get(args, 'F')) == NULL)
! 			win_template = CMD_CHOOSE_TREE_WINDOW_TEMPLATE;
  
  		if (args->argc != 0)
  			win_action = args->argv[0];
--- 111,117 ----
  	} else if (self->entry == &cmd_choose_window_entry) {
  		wflag = 1;
  		if ((win_template = args_get(args, 'F')) == NULL)
! 			win_template = CHOOSE_TREE_WINDOW_TEMPLATE;
  
  		if (args->argc != 0)
  			win_action = args->argv[0];
***************
*** 130,139 ****
  			win_action = CMD_CHOOSE_TREE_WINDOW_ACTION;
  
  		if ((ses_template = args_get(args, 'S')) == NULL)
! 			ses_template = DEFAULT_SESSION_TEMPLATE;
  
  		if ((win_template = args_get(args, 'W')) == NULL)
! 			win_template = CMD_CHOOSE_TREE_WINDOW_TEMPLATE;
  	}
  
  	/*
--- 128,137 ----
  			win_action = CMD_CHOOSE_TREE_WINDOW_ACTION;
  
  		if ((ses_template = args_get(args, 'S')) == NULL)
! 			ses_template = CHOOSE_TREE_SESSION_TEMPLATE;
  
  		if ((win_template = args_get(args, 'W')) == NULL)
! 			win_template = CHOOSE_TREE_WINDOW_TEMPLATE;
  	}
  
  	/*