===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -c -r1.195 -r1.196
*** src/usr.bin/tmux/window.c	2017/05/29 18:06:34	1.195
--- src/usr.bin/tmux/window.c	2017/05/30 21:44:59	1.196
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.195 2017/05/29 18:06:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.196 2017/05/30 21:44:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1171,1177 ****
  }
  
  int
! window_pane_set_mode(struct window_pane *wp, const struct window_mode *mode)
  {
  	struct screen	*s;
  	struct timeval	 tv = { .tv_sec = 10 };
--- 1171,1178 ----
  }
  
  int
! window_pane_set_mode(struct window_pane *wp, const struct window_mode *mode,
!     struct cmd_find_state *fs, struct args *args)
  {
  	struct screen	*s;
  	struct timeval	 tv = { .tv_sec = 10 };
***************
*** 1184,1190 ****
  	evtimer_set(&wp->modetimer, window_pane_mode_timer, wp);
  	evtimer_add(&wp->modetimer, &tv);
  
! 	if ((s = wp->mode->init(wp)) != NULL)
  		wp->screen = s;
  	wp->flags |= (PANE_REDRAW|PANE_CHANGED);
  
--- 1185,1191 ----
  	evtimer_set(&wp->modetimer, window_pane_mode_timer, wp);
  	evtimer_add(&wp->modetimer, &tv);
  
! 	if ((s = wp->mode->init(wp, fs, args)) != NULL)
  		wp->screen = s;
  	wp->flags |= (PANE_REDRAW|PANE_CHANGED);
  
***************
*** 1289,1320 ****
  	if (i == screen_size_y(s))
  		return (0);
  	return (i + 1);
- }
- 
- char *
- window_pane_search_old(struct window_pane *wp, const char *searchstr,
-     u_int *lineno)
- {
- 	struct screen	*s = &wp->base;
- 	char		*newsearchstr, *line, *msg;
- 	u_int		 i;
- 
- 	msg = NULL;
- 	xasprintf(&newsearchstr, "*%s*", searchstr);
- 
- 	for (i = 0; i < screen_size_y(s); i++) {
- 		line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
- 		if (fnmatch(newsearchstr, line, 0) == 0) {
- 			msg = line;
- 			if (lineno != NULL)
- 				*lineno = i;
- 			break;
- 		}
- 		free(line);
- 	}
- 
- 	free(newsearchstr);
- 	return (msg);
  }
  
  /* Get MRU pane from a list. */
--- 1290,1295 ----