Mercurial > vim
changeset 20705:5481c982a279 v8.2.0906
patch 8.2.0906: when setting 'termguicolors' SpellBad is no longer red
Commit: https://github.com/vim/vim/commit/ea563cc22be043ff91dcbdf2878c3d1fd944e573
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jun 5 19:36:57 2020 +0200
patch 8.2.0906: when setting 'termguicolors' SpellBad is no longer red
Problem: When setting 'termguicolors' SpellBad is no longer red.
Solution: Only use the RGB guisp color for cterm when using the "underline"
or "undercurl" attributes to avoid the background color to be
cleared. Also make t_8u empty when the termresponse indicates a
real xterm. (closes #6207)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 05 Jun 2020 19:45:03 +0200 |
parents | 487481a57366 |
children | 666c23d18e53 |
files | src/highlight.c src/term.c src/version.c |
diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/highlight.c +++ b/src/highlight.c @@ -2929,7 +2929,12 @@ set_hl_attr( # endif at_en.ae_u.cterm.fg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_fg); at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_bg); - at_en.ae_u.cterm.ul_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_sp); + // Only use the underline/undercurl color when used, it may clear the + // background color if not supported. + if (sgp->sg_cterm & (HL_UNDERLINE | HL_UNDERCURL)) + at_en.ae_u.cterm.ul_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_sp); + else + at_en.ae_u.cterm.ul_rgb = INVALCOLOR; if (at_en.ae_u.cterm.fg_rgb == INVALCOLOR && at_en.ae_u.cterm.bg_rgb == INVALCOLOR) {
--- a/src/term.c +++ b/src/term.c @@ -4819,6 +4819,11 @@ not_enough: if (version < 95) is_not_xterm = TRUE; + // With the real Xterm setting the underline RGB color + // clears the background color, disable "t_8u". + if (!is_not_xterm && *T_8U != NUL) + T_8U = empty_option; + // Only request the cursor style if t_SH and t_RS are // set. Only supported properly by xterm since version // 279 (otherwise it returns 0x18).