===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-window.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/tmux/cmd-select-window.c	2014/10/20 22:29:25	1.12
--- src/usr.bin/tmux/cmd-select-window.c	2015/12/13 14:32:38	1.13
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-window.c,v 1.12 2014/10/20 22:29:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-select-window.c,v 1.13 2015/12/13 14:32:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 32,38 ****
  	"select-window", "selectw",
  	"lnpTt:", 0, 0,
  	"[-lnpT] " CMD_TARGET_WINDOW_USAGE,
! 	0,
  	cmd_select_window_exec
  };
  
--- 32,38 ----
  	"select-window", "selectw",
  	"lnpTt:", 0, 0,
  	"[-lnpT] " CMD_TARGET_WINDOW_USAGE,
! 	CMD_WINDOW_T,
  	cmd_select_window_exec
  };
  
***************
*** 40,46 ****
  	"next-window", "next",
  	"at:", 0, 0,
  	"[-a] " CMD_TARGET_SESSION_USAGE,
! 	0,
  	cmd_select_window_exec
  };
  
--- 40,46 ----
  	"next-window", "next",
  	"at:", 0, 0,
  	"[-a] " CMD_TARGET_SESSION_USAGE,
! 	CMD_SESSION_T,
  	cmd_select_window_exec
  };
  
***************
*** 48,54 ****
  	"previous-window", "prev",
  	"at:", 0, 0,
  	"[-a] " CMD_TARGET_SESSION_USAGE,
! 	0,
  	cmd_select_window_exec
  };
  
--- 48,54 ----
  	"previous-window", "prev",
  	"at:", 0, 0,
  	"[-a] " CMD_TARGET_SESSION_USAGE,
! 	CMD_SESSION_T,
  	cmd_select_window_exec
  };
  
***************
*** 56,71 ****
  	"last-window", "last",
  	"t:", 0, 0,
  	CMD_TARGET_SESSION_USAGE,
! 	0,
  	cmd_select_window_exec
  };
  
  enum cmd_retval
  cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
! 	struct args	*args = self->args;
! 	struct winlink	*wl;
! 	struct session	*s;
  	int		 next, previous, last, activity;
  
  	next = self->entry == &cmd_next_window_entry;
--- 56,70 ----
  	"last-window", "last",
  	"t:", 0, 0,
  	CMD_TARGET_SESSION_USAGE,
! 	CMD_SESSION_T,
  	cmd_select_window_exec
  };
  
  enum cmd_retval
  cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
! 	struct winlink	*wl = cmdq->state.tflag.wl;
! 	struct session	*s = cmdq->state.tflag.s;
  	int		 next, previous, last, activity;
  
  	next = self->entry == &cmd_next_window_entry;
***************
*** 79,88 ****
  		last = 1;
  
  	if (next || previous || last) {
- 		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
- 		if (s == NULL)
- 			return (CMD_RETURN_ERROR);
- 
  		activity = args_has(self->args, 'a');
  		if (next) {
  			if (session_next(s, activity) != 0) {
--- 78,83 ----
***************
*** 103,112 ****
  
  		server_redraw_session(s);
  	} else {
- 		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
- 		if (wl == NULL)
- 			return (CMD_RETURN_ERROR);
- 
  		/*
  		 * If -T and select-window is invoked on same window as
  		 * current, switch to previous window.
--- 98,103 ----