patch 8.0.0142

brammool · brammool · commit 0cdb72aa38c4 · 2017-01-02T21:37:40.000+01:00
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
@@ -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
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    142,
 /**/
     141,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -8765,6 +8765,10 @@ hl_combine_attr(int char_attr, int prim_attr)`
`8765`	`8765`	`else`
`8766`	`8766`	`{`
`8767`	`8767`	`vim_memset(&new_en, 0, sizeof(new_en));`
	`8768`	`+#ifdef FEAT_TERMGUICOLORS`
	`8769`	`+ new_en.ae_u.cterm.bg_rgb = INVALCOLOR;`
	`8770`	`+ new_en.ae_u.cterm.fg_rgb = INVALCOLOR;`
	`8771`	`+#endif`
`8768`	`8772`	`if (char_attr <= HL_ALL)`
`8769`	`8773`	`new_en.ae_attr = char_attr;`
`8770`	`8774`	`}`