diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 12:04:09 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 12:04:09 +0100 |
| commit | 07c679b52d18f198a60da2bd5b9b743bac55680f (patch) | |
| tree | 6e6db084991d889e61e0a5d53db1f8740a666ce6 /tmux.h | |
| parent | 2e4e521629a8e23502551cfe13ea327e1971d1e2 (diff) | |
| parent | b4c633cc40cd3d5963e24e6d560bc2c7f6553000 (diff) | |
| download | rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.tar.gz rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.tar.bz2 rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.zip | |
Merge branch 'master' into 2.6-rc
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 20 |
1 files changed, 11 insertions, 9 deletions
@@ -1772,20 +1772,22 @@ void cmd_find_copy_state(struct cmd_find_state *, struct cmd_find_state *); void cmd_find_log_state(const char *, struct cmd_find_state *); void cmd_find_from_session(struct cmd_find_state *, - struct session *); + struct session *, int); void cmd_find_from_winlink(struct cmd_find_state *, - struct winlink *); + struct winlink *, int); int cmd_find_from_session_window(struct cmd_find_state *, - struct session *, struct window *); -int cmd_find_from_window(struct cmd_find_state *, struct window *); + struct session *, struct window *, int); +int cmd_find_from_window(struct cmd_find_state *, struct window *, + int); void cmd_find_from_winlink_pane(struct cmd_find_state *, - struct winlink *, struct window_pane *); + struct winlink *, struct window_pane *, int); int cmd_find_from_pane(struct cmd_find_state *, - struct window_pane *); -int cmd_find_from_client(struct cmd_find_state *, struct client *); + struct window_pane *, int); +int cmd_find_from_client(struct cmd_find_state *, struct client *, + int); int cmd_find_from_mouse(struct cmd_find_state *, - struct mouse_event *); -int cmd_find_from_nothing(struct cmd_find_state *); + struct mouse_event *, int); +int cmd_find_from_nothing(struct cmd_find_state *, int); /* cmd.c */ int cmd_pack_argv(int, char **, char *, size_t); |