Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-07-06 23:02:26 +01:00
8 changed files with 19 additions and 17 deletions

6
tmux.h
View File

@@ -598,13 +598,13 @@ enum utf8_state {
/* Grid cell data. */
struct grid_cell {
u_char flags;
struct utf8_data data; /* 21 bytes */
u_short attr;
u_char flags;
int fg;
int bg;
int us;
struct utf8_data data;
};
} __packed;
struct grid_cell_entry {
u_char flags;
union {