diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
commit | 9e537c808b95e01165f1c2831b3737b93c0110c3 (patch) | |
tree | c4e0394a8c366356187696f03cf6cd21923ca42a /tmux.h | |
parent | 4ccb2e2c218a10a8039ca801231aaf09b6bf3bce (diff) | |
parent | 2c4543b9e9bd38bcc45393dad94930bcde872e6c (diff) | |
download | rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.gz rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.bz2 rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.zip |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -477,7 +477,7 @@ struct msg_identify_data { #define IDENTIFY_UTF8 0x1 #define IDENTIFY_256COLOURS 0x2 -#define IDENTIFY_88COLOURS 0x4 +/* 0x4 unused */ #define IDENTIFY_CONTROL 0x8 #define IDENTIFY_TERMIOS 0x10 int flags; @@ -1137,8 +1137,7 @@ struct tty_term { struct tty_code codes[NTTYCODE]; #define TERM_256COLOURS 0x1 -#define TERM_88COLOURS 0x2 -#define TERM_EARLYWRAP 0x4 +#define TERM_EARLYWRAP 0x2 int flags; LIST_ENTRY(tty_term) entry; @@ -1982,7 +1981,6 @@ void colour_set_bg(struct grid_cell *, int); const char *colour_tostring(int); int colour_fromstring(const char *); u_char colour_256to16(u_char); -u_char colour_256to88(u_char); /* attributes.c */ const char *attributes_tostring(u_char); |