===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-window.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/cmd-select-window.c	2016/10/10 21:51:39	1.17
--- src/usr.bin/tmux/cmd-select-window.c	2016/10/16 19:04:05	1.18
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-window.c,v 1.17 2016/10/10 21:51:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-select-window.c,v 1.18 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 26,32 ****
   * Select window by index.
   */
  
! static enum cmd_retval	 cmd_select_window_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_select_window_entry = {
  	.name = "select-window",
--- 26,33 ----
   * Select window by index.
   */
  
! static enum cmd_retval	cmd_select_window_exec(struct cmd *,
! 			    struct cmdq_item *);
  
  const struct cmd_entry cmd_select_window_entry = {
  	.name = "select-window",
***************
*** 81,90 ****
  };
  
  static 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;
--- 82,91 ----
  };
  
  static enum cmd_retval
! cmd_select_window_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	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;
***************
*** 101,117 ****
  		activity = args_has(self->args, 'a');
  		if (next) {
  			if (session_next(s, activity) != 0) {
! 				cmdq_error(cmdq, "no next window");
  				return (CMD_RETURN_ERROR);
  			}
  		} else if (previous) {
  			if (session_previous(s, activity) != 0) {
! 				cmdq_error(cmdq, "no previous window");
  				return (CMD_RETURN_ERROR);
  			}
  		} else {
  			if (session_last(s) != 0) {
! 				cmdq_error(cmdq, "no last window");
  				return (CMD_RETURN_ERROR);
  			}
  		}
--- 102,118 ----
  		activity = args_has(self->args, 'a');
  		if (next) {
  			if (session_next(s, activity) != 0) {
! 				cmdq_error(item, "no next window");
  				return (CMD_RETURN_ERROR);
  			}
  		} else if (previous) {
  			if (session_previous(s, activity) != 0) {
! 				cmdq_error(item, "no previous window");
  				return (CMD_RETURN_ERROR);
  			}
  		} else {
  			if (session_last(s) != 0) {
! 				cmdq_error(item, "no last window");
  				return (CMD_RETURN_ERROR);
  			}
  		}
***************
*** 124,130 ****
  		 */
  		if (args_has(self->args, 'T') && wl == s->curw) {
  			if (session_last(s) != 0) {
! 				cmdq_error(cmdq, "no last window");
  				return (-1);
  			}
  			server_redraw_session(s);
--- 125,131 ----
  		 */
  		if (args_has(self->args, 'T') && wl == s->curw) {
  			if (session_last(s) != 0) {
! 				cmdq_error(item, "no last window");
  				return (-1);
  			}
  			server_redraw_session(s);