From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 3 Jun 2020 08:04:49 +0000 (+0200)
Subject: patch 8.2.0891: clang warns for invalid conversion
X-Git-Tag: v8.2.0891
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc836556d962058d8b8fbc45c400b7e9d643976a;p=thirdparty%2Fvim.git

patch 8.2.0891: clang warns for invalid conversion

Problem:    Clang warns for invalid conversion.
Solution:   Use zero instead of INVALCOLOR.
---

diff --git a/src/highlight.c b/src/highlight.c
index 852fffba9b..9ce610293c 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -2235,7 +2235,7 @@ get_cterm_attr_idx(int attr, int fg, int bg)
     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;
+    at_en.ae_u.cterm.ul_color = 0;
     return get_attr_entry(&cterm_attr_table, &at_en);
 }
 #endif
diff --git a/src/version.c b/src/version.c
index 986df70214..b0fd4b3de8 100644
--- 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 */
+/**/
+    891,
 /**/
     890,
 /**/