Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-06 20:01:33 +01:00
5 changed files with 53 additions and 49 deletions

3
tmux.h
View File

@ -906,7 +906,6 @@ struct window_pane {
int fd;
struct bufferevent *event;
u_int disabled;
struct event resize_timer;
@ -927,8 +926,6 @@ struct window_pane {
size_t status_size;
TAILQ_HEAD (, window_mode_entry) modes;
struct event modetimer;
time_t modelast;
char *searchstr;
int searchregex;