===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find-window.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -c -r1.38 -r1.39
*** src/usr.bin/tmux/cmd-find-window.c	2016/10/10 21:51:39	1.38
--- src/usr.bin/tmux/cmd-find-window.c	2016/10/16 19:04:05	1.39
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find-window.c,v 1.38 2016/10/10 21:51:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find-window.c,v 1.39 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 33,41 ****
  	"[#{window_width}x#{window_height}] "			\
  	"(#{window_panes} panes) #{window_find_matches}"
  
! static enum cmd_retval	 cmd_find_window_exec(struct cmd *, struct cmd_q *);
  
! static void	cmd_find_window_callback(struct window_choose_data *);
  
  /* Flags for determining matching behavior. */
  #define CMD_FIND_WINDOW_BY_TITLE   0x1
--- 33,41 ----
  	"[#{window_width}x#{window_height}] "			\
  	"(#{window_panes} panes) #{window_find_matches}"
  
! static enum cmd_retval	cmd_find_window_exec(struct cmd *, struct cmdq_item *);
  
! static void		cmd_find_window_callback(struct window_choose_data *);
  
  /* Flags for determining matching behavior. */
  #define CMD_FIND_WINDOW_BY_TITLE   0x1
***************
*** 139,151 ****
  }
  
  static enum cmd_retval
! cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args			*args = self->args;
! 	struct client			*c = cmdq->state.c;
  	struct window_choose_data	*cdata;
! 	struct session			*s = cmdq->state.tflag.s;
! 	struct winlink			*wl = cmdq->state.tflag.wl, *wm;
  	struct cmd_find_window_list	 find_list;
  	struct cmd_find_window_data	*find_data;
  	struct cmd_find_window_data	*find_data1;
--- 139,151 ----
  }
  
  static enum cmd_retval
! cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args			*args = self->args;
! 	struct client			*c = item->state.c;
  	struct window_choose_data	*cdata;
! 	struct session			*s = item->state.tflag.s;
! 	struct winlink			*wl = item->state.tflag.wl, *wm;
  	struct cmd_find_window_list	 find_list;
  	struct cmd_find_window_data	*find_data;
  	struct cmd_find_window_data	*find_data1;
***************
*** 154,160 ****
  	u_int				 i, match_flags;
  
  	if (c == NULL) {
! 		cmdq_error(cmdq, "no client available");
  		return (CMD_RETURN_ERROR);
  	}
  
--- 154,160 ----
  	u_int				 i, match_flags;
  
  	if (c == NULL) {
! 		cmdq_error(item, "no client available");
  		return (CMD_RETURN_ERROR);
  	}
  
***************
*** 172,178 ****
  	free(searchstr);
  
  	if (TAILQ_EMPTY(&find_list)) {
! 		cmdq_error(cmdq, "no windows matching: %s", str);
  		return (CMD_RETURN_ERROR);
  	}
  
--- 172,178 ----
  	free(searchstr);
  
  	if (TAILQ_EMPTY(&find_list)) {
! 		cmdq_error(item, "no windows matching: %s", str);
  		return (CMD_RETURN_ERROR);
  	}