Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-14 02:01:14 +01:00
13 changed files with 58 additions and 114 deletions

4
tmux.h
View File

@ -1341,8 +1341,7 @@ struct cmd_q {
int references;
int flags;
#define CMD_Q_DEAD 0x1
#define CMD_Q_REENTRY 0x2
#define CMD_Q_NOHOOKS 0x4
#define CMD_Q_NOHOOKS 0x2
struct client *client;
int client_exit;
@ -1406,6 +1405,7 @@ struct cmd_entry {
#define CMD_STARTSERVER 0x1
#define CMD_READONLY 0x2
#define CMD_AFTERHOOK 0x4
int flags;
enum cmd_retval (*exec)(struct cmd *, struct cmd_q *);