Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-05-10 14:01:11 +01:00
4 changed files with 14 additions and 11 deletions

4
tmux.h
View File

@ -1805,8 +1805,8 @@ void key_bindings_add(const char *, key_code, int, struct cmd_list *);
void key_bindings_remove(const char *, key_code);
void key_bindings_remove_table(const char *);
void key_bindings_init(void);
void key_bindings_dispatch(struct key_binding *, struct client *,
struct mouse_event *, struct cmd_find_state *);
void key_bindings_dispatch(struct key_binding *, struct cmdq_item *,
struct client *, struct mouse_event *, struct cmd_find_state *);
/* key-string.c */
key_code key_string_lookup_string(const char *);