Merge branch 'obsd-master'

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

3
tmux.h
View File

@ -1332,6 +1332,8 @@ struct client {
struct event status_timer;
struct screen status;
struct screen *old_status;
#define CLIENT_TERMINAL 0x1
#define CLIENT_LOGIN 0x2
#define CLIENT_EXIT 0x4
@ -1380,6 +1382,7 @@ struct client {
#define PROMPT_SINGLE 0x1
#define PROMPT_NUMERIC 0x2
#define PROMPT_INCREMENTAL 0x4
#define PROMPT_NOFORMAT 0x8
int prompt_flags;
struct session *session;