Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-05-13 23:02:26 +01:00
8 changed files with 21 additions and 4 deletions

2
tmux.h
View File

@@ -433,6 +433,7 @@ enum tty_code_code {
TTYC_SITM,
TTYC_SMACS,
TTYC_SMCUP,
TTYC_SMOL,
TTYC_SMKX,
TTYC_SMSO,
TTYC_SMULX,
@@ -570,6 +571,7 @@ enum utf8_state {
#define GRID_ATTR_UNDERSCORE_3 0x400
#define GRID_ATTR_UNDERSCORE_4 0x800
#define GRID_ATTR_UNDERSCORE_5 0x1000
#define GRID_ATTR_OVERLINE 0x2000
/* All underscore attributes. */
#define GRID_ATTR_ALL_UNDERSCORE \