patch 8.2.0890: no color in terminal window when 'termguicolor' is set

Problem:    No color in terminal window when 'termguicolor' is set.
Solution:   Clear the underline color. (closes #6186)

diff --git a/src/highlight.c b/src/highlight.c
index e44696675204f7aff2d60b919136c2cb268d04d4..852fffba9b0204af2639dfe5567458a19504aec9 100644 (file)
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -2230,10 +2230,12 @@ get_cterm_attr_idx(int attr, int fg, int bg)
 #ifdef FEAT_TERMGUICOLORS
     at_en.ae_u.cterm.fg_rgb = INVALCOLOR;
     at_en.ae_u.cterm.bg_rgb = INVALCOLOR;
+    at_en.ae_u.cterm.ul_rgb = INVALCOLOR;
 #endif
     at_en.ae_attr = attr;
     at_en.ae_u.cterm.fg_color = fg;
     at_en.ae_u.cterm.bg_color = bg;
+    at_en.ae_u.cterm.ul_color = INVALCOLOR;
     return get_attr_entry(&cterm_attr_table, &at_en);
 }
 #endif
@@ -2262,6 +2264,7 @@ get_tgc_attr_idx(int attr, guicolor_T fg, guicolor_T bg)
        at_en.ae_u.cterm.fg_rgb = fg;
        at_en.ae_u.cterm.bg_rgb = bg;
     }
+    at_en.ae_u.cterm.ul_rgb = INVALCOLOR;
     return get_attr_entry(&cterm_attr_table, &at_en);
 }
 #endif

diff --git a/src/version.c b/src/version.c
index ece5a39efbc8b2bb5fa5fe5fe12d686e5b1db509..986df70214af4739a40f0abd0770d8c6d6445ab7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    890,
 /**/
     889,
 /**/