summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-03 10:04:49 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-03 10:04:49 +0200
commitcc836556d962058d8b8fbc45c400b7e9d643976a (patch)
tree0ccd0a964f36cf4e6f9982d0827f88da80b16486
parent1e5f8f6d65b2ecff3d93d9fdbdd17c7a2ab9cc3d (diff)
patch 8.2.0891: clang warns for invalid conversionv8.2.0891
Problem: Clang warns for invalid conversion. Solution: Use zero instead of INVALCOLOR.
-rw-r--r--src/highlight.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 891,
+/**/
890,
/**/
889,