Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-06-07 16:01:10 +01:00
6 changed files with 209 additions and 25 deletions

6
tmux.h
View File

@ -2207,8 +2207,8 @@ void mode_tree_up(struct mode_tree_data *, int);
void mode_tree_down(struct mode_tree_data *, int);
struct mode_tree_data *mode_tree_start(struct window_pane *,
void (*)(void *, u_int, uint64_t *), struct screen *(*)(void *,
void *, u_int, u_int), void *, const char **, u_int,
struct screen **);
void *, u_int, u_int), int (*)(void *, void *, const char *),
void *, const char **, u_int, struct screen **);
void mode_tree_build(struct mode_tree_data *);
void mode_tree_free(struct mode_tree_data *);
void mode_tree_resize(struct mode_tree_data *, u_int, u_int);
@ -2217,7 +2217,7 @@ struct mode_tree_item *mode_tree_add(struct mode_tree_data *,
const char *, int);
void mode_tree_remove(struct mode_tree_data *, struct mode_tree_item *);
void mode_tree_draw(struct mode_tree_data *);
int mode_tree_key(struct mode_tree_data *, key_code *,
int mode_tree_key(struct mode_tree_data *, struct client *, key_code *,
struct mouse_event *);
void mode_tree_run_command(struct client *, struct cmd_find_state *,
const char *, const char *);