patch 8.1.0997: using GUI colors in vim.exe when 'termguicolors' is off

Problem:    Using GUI colors in vim.exe when 'termguicolors' is off.
Solution:   Add condition for 'termguicolors' set. (Ken Takata, closes #4078)

diff --git a/src/os_win32.c b/src/os_win32.c
index df6f7db7874e29b8a960d440aac08bbcc3ece38d..876a7a409ac6ee99e7067b8301e17f58b6429cad 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -7844,7 +7844,7 @@ set_console_color_rgb(void)
        return;
 
     id = syn_name2id((char_u *)"Normal");
-    if (id > 0)
+    if (id > 0 && p_tgc)
        syn_id2colors(id, &fg, &bg);
     if (fg == INVALCOLOR)
     {

diff --git a/src/version.c b/src/version.c
index e1c8c61da67d3e83aba5672750903572e5066819..539a1e10d48cb8c456881c7fbe361d40b3a79e2b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    997,
 /**/
     996,
 /**/