===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -c -r1.46 -r1.47
*** src/usr.bin/tmux/cmd-find.c	2017/04/21 14:09:44	1.46
--- src/usr.bin/tmux/cmd-find.c	2017/04/21 17:22:20	1.47
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.46 2017/04/21 14:09:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.47 2017/04/21 17:22:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 879,885 ****
  }
  
  /* Find state from a session. */
! int
  cmd_find_from_session(struct cmd_find_state *fs, struct session *s)
  {
  	cmd_find_clear_state(fs, NULL, 0);
--- 879,885 ----
  }
  
  /* Find state from a session. */
! void
  cmd_find_from_session(struct cmd_find_state *fs, struct session *s)
  {
  	cmd_find_clear_state(fs, NULL, 0);
***************
*** 890,900 ****
  	fs->wp = fs->w->active;
  
  	cmd_find_log_state(__func__, fs);
- 	return (0);
  }
  
  /* Find state from a winlink. */
! int
  cmd_find_from_winlink(struct cmd_find_state *fs, struct winlink *wl)
  {
  	cmd_find_clear_state(fs, NULL, 0);
--- 890,899 ----
  	fs->wp = fs->w->active;
  
  	cmd_find_log_state(__func__, fs);
  }
  
  /* Find state from a winlink. */
! void
  cmd_find_from_winlink(struct cmd_find_state *fs, struct winlink *wl)
  {
  	cmd_find_clear_state(fs, NULL, 0);
***************
*** 905,911 ****
  	fs->wp = wl->window->active;
  
  	cmd_find_log_state(__func__, fs);
- 	return (0);
  }
  
  /* Find state from a session and window. */
--- 904,909 ----
***************
*** 940,945 ****
--- 938,959 ----
  
  	cmd_find_log_state(__func__, fs);
  	return (0);
+ }
+ 
+ /* Find state from a winlink and pane. */
+ void
+ cmd_find_from_winlink_pane(struct cmd_find_state *fs, struct winlink *wl,
+     struct window_pane *wp)
+ {
+ 	cmd_find_clear_state(fs, NULL, 0);
+ 
+ 	fs->s = wl->session;
+ 	fs->wl = wl;
+ 	fs->idx = fs->wl->idx;
+ 	fs->w = fs->wl->window;
+ 	fs->wp = wp;
+ 
+ 	cmd_find_log_state(__func__, fs);
  }
  
  /* Find state from a pane. */