Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-05-26 14:02:15 +01:00
9 changed files with 103 additions and 38 deletions

3
tmux.h
View File

@ -500,6 +500,7 @@ enum msgtype {
MSG_IDENTIFY_CLIENTPID,
MSG_IDENTIFY_CWD,
MSG_IDENTIFY_FEATURES,
MSG_IDENTIFY_STDOUT,
MSG_COMMAND = 200,
MSG_DETACH,
@ -969,6 +970,7 @@ struct window_pane {
int fd;
struct bufferevent *event;
struct window_pane_offset offset;
size_t base_offset;
@ -1583,6 +1585,7 @@ struct client {
pid_t pid;
int fd;
int out_fd;
struct event event;
int retval;