patch 8.0.0142

Problem:    Normal colors are wrong with 'termguicolors'.
Solution:   Initialize to INVALCOLOR instead of zero. (Ben Jackson, closes
            #1344)

diff --git a/src/syntax.c b/src/syntax.c
index 75ede361ca3af213a8e2712806255d1068eccf6a..b2108e4d93fa0b8f3233714710d70a6e1cc46f7a 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -8765,6 +8765,10 @@ hl_combine_attr(int char_attr, int prim_attr)
        else
        {
            vim_memset(&new_en, 0, sizeof(new_en));
+#ifdef FEAT_TERMGUICOLORS
+           new_en.ae_u.cterm.bg_rgb = INVALCOLOR;
+           new_en.ae_u.cterm.fg_rgb = INVALCOLOR;
+#endif
            if (char_attr <= HL_ALL)
                new_en.ae_attr = char_attr;
        }

diff --git a/src/version.c b/src/version.c
index 6c46e31ad48796223ca826bfe65644b395698bdf..4ee83cd4acbf153a37e462c9110216755a116358 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    142,
 /**/
     141,
 /**/