Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-06-05 14:01:19 +01:00
4 changed files with 79 additions and 77 deletions

6
tmux.h
View File

@ -930,9 +930,6 @@ struct window_pane {
u_int sx;
u_int sy;
u_int osx;
u_int osy;
u_int xoff;
u_int yoff;
@ -953,7 +950,7 @@ struct window_pane {
#define PANE_STATUSDRAWN 0x400
#define PANE_EMPTY 0x800
#define PANE_STYLECHANGED 0x1000
#define PANE_RESIZED 0x2000
#define PANE_RESIZENOW 0x2000
int argc;
char **argv;
@ -971,6 +968,7 @@ struct window_pane {
size_t base_offset;
struct event resize_timer;
struct event force_timer;
struct input_ctx *ictx;