Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-09-22 08:01:18 +01:00
4 changed files with 26 additions and 9 deletions

3
tmux.h
View File

@ -498,6 +498,7 @@ enum msgtype {
MSG_IDENTIFY_CWD,
MSG_IDENTIFY_FEATURES,
MSG_IDENTIFY_STDOUT,
MSG_IDENTIFY_LONGFLAGS,
MSG_COMMAND = 200,
MSG_DETACH,
@ -2333,7 +2334,7 @@ void printflike(2, 3) cmdq_error(struct cmdq_item *, const char *, ...);
void cmd_wait_for_flush(void);
/* client.c */
int client_main(struct event_base *, int, char **, int, int);
int client_main(struct event_base *, int, char **, uint64_t, int);
/* key-bindings.c */
struct key_table *key_bindings_get_table(const char *, int);