===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- src/usr.bin/tmux/tmux.h	2015/12/15 13:43:07	1.612
+++ src/usr.bin/tmux/tmux.h	2015/12/16 21:50:37	1.613
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.612 2015/12/15 13:43:07 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.613 2015/12/16 21:50:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1379,6 +1379,7 @@
 	struct cmd		*cmd;
 	struct cmd_q		*parent;
 
+	struct cmd_find_state	 current;
 	struct cmd_state	 state;
 
 	time_t			 time;
@@ -1576,6 +1577,7 @@
 
 /* hooks.c */
 struct hook;
+struct hooks 	*hooks_get(struct session *);
 struct hooks	*hooks_create(struct hooks *);
 void		 hooks_free(struct hooks *);
 struct hook	*hooks_first(struct hooks *);
@@ -1584,10 +1586,10 @@
 void		 hooks_copy(struct hooks *, struct hooks *);
 void		 hooks_remove(struct hooks *, const char *);
 struct hook	*hooks_find(struct hooks *, const char *);
-int printflike(3, 4) hooks_run(struct hooks *, struct client *, const char *,
-		    ...);
-int printflike(3, 4) hooks_wait(struct hooks *, struct cmd_q *, const char *,
-		    ...);
+int printflike(4, 5) hooks_run(struct hooks *, struct client *,
+		    struct cmd_find_state *, const char *, ...);
+int printflike(4, 5) hooks_wait(struct hooks *, struct cmd_q *,
+		    struct cmd_find_state *, const char *, ...);
 
 /* mode-key.c */
 extern const struct mode_key_table mode_key_tables[];
@@ -1776,6 +1778,11 @@
 void		 cmd_find_copy_state(struct cmd_find_state *,
 		     struct cmd_find_state *);
 void		 cmd_find_log_state(const char *, struct cmd_find_state *);
+int		 cmd_find_from_session(struct cmd_find_state *,
+		     struct session *);
+int		 cmd_find_from_window(struct cmd_find_state *, struct window *);
+int		 cmd_find_from_pane(struct cmd_find_state *,
+		     struct window_pane *);
 
 /* cmd.c */
 int		 cmd_pack_argv(int, char **, char *, size_t);
@@ -1896,7 +1903,7 @@
 int	 server_link_window(struct session *,
 	     struct winlink *, struct session *, int, int, int, char **);
 void	 server_unlink_window(struct session *, struct winlink *);
-void	 server_destroy_pane(struct window_pane *);
+void	 server_destroy_pane(struct window_pane *, int);
 void	 server_destroy_session_group(struct session *);
 void	 server_destroy_session(struct session *);
 void	 server_check_unattached(void);