diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-21 12:24:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-21 12:24:12 +0200 |
| commit | d4f73438bb6c88a0d3e315f0eebef30993b5921c (patch) | |
| tree | 84965260e43513e584f0cee85ba74de1c6c078f0 | |
| parent | 3f3fb0b14734272e7c817020c847aaa0fba5cea5 (diff) | |
patch 8.1.0415: not actually using 16 colors with vtpv8.1.0415
Problem: Not actually using 16 colors with vtp.
Solution: Always use 256 colors when vtp is used. (Nobuhiro Takasaki,
closes #3432)
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/term.c | 44 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/option.c b/src/option.c index 763aab07a6..f89c4730bb 100644 --- a/src/option.c +++ b/src/option.c @@ -7785,8 +7785,6 @@ did_set_string_option( #if defined(FEAT_VTP) && defined(FEAT_TERMGUICOLORS) if (did_swaptcap) { - if (t_colors < 256) - p_tgc = 0; set_termname((char_u *)"win32"); init_highlight(TRUE, FALSE); } diff --git a/src/term.c b/src/term.c index a92f04ec37..82bb426362 100644 --- a/src/term.c +++ b/src/term.c @@ -6743,35 +6743,35 @@ update_tcap(int attr) # define KSSIZE 20 struct ks_tbl_s { - int code; /* value of KS_ */ - char *vtp; /* code in vtp mode */ - char *vtp2; /* code in vtp2 mode */ - char buf[KSSIZE]; /* save buffer in non-vtp mode */ - char vbuf[KSSIZE]; /* save buffer in vtp mode */ - char v2buf[KSSIZE]; /* save buffer in vtp2 mode */ - char arr[KSSIZE]; /* real buffer */ + int code; // value of KS_ + char *vtp; // code in vtp mode + char *vtp2; // code in vtp2 mode + char buf[KSSIZE]; // save buffer in non-vtp mode + char vbuf[KSSIZE]; // save buffer in vtp mode + char v2buf[KSSIZE]; // save buffer in vtp2 mode + char arr[KSSIZE]; // real buffer }; static struct ks_tbl_s ks_tbl[] = { - {(int)KS_ME, "\033|0m", "\033|0m"}, /* normal */ - {(int)KS_MR, "\033|7m", "\033|7m"}, /* reverse */ - {(int)KS_MD, "\033|1m", "\033|1m"}, /* bold */ - {(int)KS_SO, "\033|91m", "\033|91m"}, /* standout: bright red text */ - {(int)KS_SE, "\033|39m", "\033|39m"}, /* standout end: default color */ - {(int)KS_CZH, "\033|95m", "\033|95m"}, /* italic: bright magenta text */ - {(int)KS_CZR, "\033|0m", "\033|0m"}, /* italic end */ - {(int)KS_US, "\033|4m", "\033|4m"}, /* underscore */ - {(int)KS_UE, "\033|24m", "\033|24m"}, /* underscore end */ + {(int)KS_ME, "\033|0m", "\033|0m"}, // normal + {(int)KS_MR, "\033|7m", "\033|7m"}, // reverse + {(int)KS_MD, "\033|1m", "\033|1m"}, // bold + {(int)KS_SO, "\033|91m", "\033|91m"}, // standout: bright red text + {(int)KS_SE, "\033|39m", "\033|39m"}, // standout end: default color + {(int)KS_CZH, "\033|95m", "\033|95m"}, // italic: bright magenta text + {(int)KS_CZR, "\033|0m", "\033|0m"}, // italic end + {(int)KS_US, "\033|4m", "\033|4m"}, // underscore + {(int)KS_UE, "\033|24m", "\033|24m"}, // underscore end # ifdef TERMINFO - {(int)KS_CAB, "\033|%p1%db", "\033|%p14%dm"}, /* set background color */ - {(int)KS_CAF, "\033|%p1%df", "\033|%p13%dm"}, /* set foreground color */ + {(int)KS_CAB, "\033|%p1%db", "\033|%p14%dm"}, // set background color + {(int)KS_CAF, "\033|%p1%df", "\033|%p13%dm"}, // set foreground color # else - {(int)KS_CAB, "\033|%db", "\033|4%dm"}, /* set background color */ - {(int)KS_CAF, "\033|%df", "\033|3%dm"}, /* set foreground color */ + {(int)KS_CAB, "\033|%db", "\033|4%dm"}, // set background color + {(int)KS_CAF, "\033|%df", "\033|3%dm"}, // set foreground color # endif - {(int)KS_CCO, "16", "256"}, /* colors */ - {(int)KS_NAME} /* terminator */ + {(int)KS_CCO, "256", "256"}, // colors + {(int)KS_NAME} // terminator }; static struct builtin_term * diff --git a/src/version.c b/src/version.c index 3ce73b9ea2..637ea9909f 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 415, +/**/ 414, /**/ 413, |