Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-09-12 18:01:12 +01:00
8 changed files with 371 additions and 331 deletions

3
tmux.h
View File

@ -568,6 +568,7 @@ struct mode_key_data {
/* Binding between a key and a command. */
struct mode_key_binding {
key_code key;
u_int repeat;
int mode;
enum mode_key_cmd cmd;
@ -1635,7 +1636,7 @@ const struct mode_key_table *mode_key_findtable(const char *);
void mode_key_init_trees(void);
void mode_key_init(struct mode_key_data *, struct mode_key_tree *);
enum mode_key_cmd mode_key_lookup(struct mode_key_data *, key_code,
const char **);
const char **, u_int *);
/* notify.c */
void notify_enable(void);