===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/tmux/cmd-find.c	2016/10/13 10:01:49	1.34
--- src/usr.bin/tmux/cmd-find.c	2016/10/15 00:09:30	1.35
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.34 2016/10/13 10:01:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.35 2016/10/15 00:09:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 904,909 ****
--- 904,926 ----
  	return (0);
  }
  
+ /* Find state from a session and window. */
+ int
+ cmd_find_from_session_window(struct cmd_find_state *fs, struct session *s,
+     struct window *w)
+ {
+ 	cmd_find_clear_state(fs, NULL, 0);
+ 
+ 	fs->s = s;
+ 	fs->w = w;
+ 	if (cmd_find_best_winlink_with_window(fs) != 0)
+ 		return (-1);
+ 	fs->wp = fs->w->active;
+ 
+ 	cmd_find_log_state(__func__, fs);
+ 	return (0);
+ }
+ 
  /* Find state from a window. */
  int
  cmd_find_from_window(struct cmd_find_state *fs, struct window *w)
***************
*** 915,920 ****
--- 932,938 ----
  		return (-1);
  	if (cmd_find_best_winlink_with_window(fs) != 0)
  		return (-1);
+ 	fs->wp = fs->w->active;
  
  	cmd_find_log_state(__func__, fs);
  	return (0);