From 0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 2 Jan 2017 21:37:40 +0100 Subject: [PATCH] patch 8.0.0142 Problem: Normal colors are wrong with 'termguicolors'. Solution: Initialize to INVALCOLOR instead of zero. (Ben Jackson, closes #1344) --- src/syntax.c | 4 ++++ src/version.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/syntax.c b/src/syntax.c index 75ede361c..b2108e4d9 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 6c46e31ad..4ee83cd4a 100644 --- 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, /**/ -- 2.40.0