From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 11 Apr 2019 09:40:13 +0000 (+0200)
Subject: patch 8.1.1146: in MS-Windows console colors in a terminal window are wrong
X-Git-Tag: v8.1.1146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef8c83c550e2562362c4385f0823e41ae67cfada;p=vim

patch 8.1.1146: in MS-Windows console colors in a terminal window are wrong

Problem:    In MS-Windows console colors in a terminal window are wrong.
Solution:   Use the ansi index also for 16 colors. (Ken Takata)
---

diff --git a/src/terminal.c b/src/terminal.c
index 01cabf021..c7dc23f90 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2433,8 +2433,8 @@ color2index(VTermColor *color, int fg, int *boldp)
     if (color->ansi_index != VTERM_ANSI_INDEX_NONE)
     {
 	/* First 16 colors and default: use the ANSI index, because these
-	 * colors can be redefined. */
-	if (t_colors >= 16)
+	 * colors can be redefined, we use the RGB values. */
+	if (t_colors > 256)
 	    return color->ansi_index;
 	switch (color->ansi_index)
 	{
@@ -3604,6 +3604,7 @@ set_vterm_palette(VTerm *vterm, long_u *rgb)
     for (; index < 16; index++)
     {
 	VTermColor	color;
+
 	color.red = (unsigned)(rgb[index] >> 16);
 	color.green = (unsigned)(rgb[index] >> 8) & 255;
 	color.blue = (unsigned)rgb[index] & 255;
diff --git a/src/version.c b/src/version.c
index 394f89c27..cb20b885b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1146,
 /**/
     1145,
 /**/