Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-21 20:01:18 +01:00
5 changed files with 26 additions and 21 deletions

7
tmux.h
View File

@ -43,7 +43,6 @@ extern char **environ;
struct args;
struct client;
struct cmdq_item;
struct cmdq_subitem;
struct cmdq_list;
struct environ;
struct input_ctx;
@ -1748,15 +1747,17 @@ int cmd_find_valid_state(struct cmd_find_state *);
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 *,
void cmd_find_from_session(struct cmd_find_state *,
struct session *);
int cmd_find_from_winlink(struct cmd_find_state *,
void cmd_find_from_winlink(struct cmd_find_state *,
struct winlink *);
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 *);
int cmd_find_from_pane(struct cmd_find_state *,
struct window_pane *);
void cmd_find_from_winlink_pane(struct cmd_find_state *,
struct winlink *, struct window_pane *);
/* cmd.c */
int cmd_pack_argv(int, char **, char *, size_t);