===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-window.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/tmux/cmd-select-window.c	2017/04/22 08:56:24	1.19
--- src/usr.bin/tmux/cmd-select-window.c	2017/04/22 10:22:39	1.20
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-window.c,v 1.19 2017/04/22 08:56:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-select-window.c,v 1.20 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 36,42 ****
  	.args = { "lnpTt:", 0, 0 },
  	.usage = "[-lnpT] " CMD_TARGET_WINDOW_USAGE,
  
! 	.tflag = CMD_WINDOW,
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
--- 36,42 ----
  	.args = { "lnpTt:", 0, 0 },
  	.usage = "[-lnpT] " CMD_TARGET_WINDOW_USAGE,
  
! 	.target = { 't', CMD_FIND_WINDOW, 0 },
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
***************
*** 49,55 ****
  	.args = { "at:", 0, 0 },
  	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
  
! 	.tflag = CMD_SESSION,
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
--- 49,55 ----
  	.args = { "at:", 0, 0 },
  	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
  
! 	.target = { 't', CMD_FIND_SESSION, 0 },
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
***************
*** 62,68 ****
  	.args = { "at:", 0, 0 },
  	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
  
! 	.tflag = CMD_SESSION,
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
--- 62,68 ----
  	.args = { "at:", 0, 0 },
  	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
  
! 	.target = { 't', CMD_FIND_SESSION, 0 },
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
***************
*** 75,81 ****
  	.args = { "t:", 0, 0 },
  	.usage = CMD_TARGET_SESSION_USAGE,
  
! 	.tflag = CMD_SESSION,
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
--- 75,81 ----
  	.args = { "t:", 0, 0 },
  	.usage = CMD_TARGET_SESSION_USAGE,
  
! 	.target = { 't', CMD_FIND_SESSION, 0 },
  
  	.flags = 0,
  	.exec = cmd_select_window_exec
***************
*** 85,92 ****
  cmd_select_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct cmd_find_state	*current = &item->shared->current;
! 	struct winlink		*wl = item->state.tflag.wl;
! 	struct session		*s = item->state.tflag.s;
  	int			 next, previous, last, activity;
  
  	next = self->entry == &cmd_next_window_entry;
--- 85,92 ----
  cmd_select_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct cmd_find_state	*current = &item->shared->current;
! 	struct winlink		*wl = item->target.wl;
! 	struct session		*s = item->target.s;
  	int			 next, previous, last, activity;
  
  	next = self->entry == &cmd_next_window_entry;