summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-02 21:37:40 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-02 21:37:40 +0100
commit0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf (patch)
treeed935b71d50f370c65793f4a848fd90efdd995a1
parentbc2eada5424bff06f7eb77c032ecc067da52b846 (diff)
patch 8.0.0142v8.0.0142
Problem: Normal colors are wrong with 'termguicolors'. Solution: Initialize to INVALCOLOR instead of zero. (Ben Jackson, closes #1344)
-rw-r--r--src/syntax.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 75ede361ca..b2108e4d93 100644
--- 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 6c46e31ad4..4ee83cd4ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 142,
+/**/
141,
/**/
140,