Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-19 00:01:15 +01:00
4 changed files with 54 additions and 50 deletions

4
tmux.h
View File

@ -1075,7 +1075,6 @@ struct tty {
TTY_VT220,
TTY_VT320,
TTY_VT420,
TTY_ITERM2,
TTY_UNKNOWN
} term_type;
@ -1090,8 +1089,7 @@ struct tty {
struct tty_key *key_tree;
};
#define TTY_TYPES \
{ "VT100", "VT101", "VT102", "VT220", "VT320", "VT420", "iTerm2", \
"Unknown" }
{ "VT100", "VT101", "VT102", "VT220", "VT320", "VT420", "Unknown" }
/* TTY command context. */
struct tty_ctx {