diff options
| author | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
| commit | b58bca9a72009101da373a3b7463fd866ecac58c (patch) | |
| tree | e8f9b4b720b4c05f67fd47505b5170c4fd33dcb0 /tmux.h | |
| parent | e312db140868754358d40ec17595327a8fbbf180 (diff) | |
| parent | 27dcf470dc4aa5901ac7f01b3a9f971e02f2229e (diff) | |
| download | rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.gz rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.bz2 rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.c
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); |