summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-07 06:40:27 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-07 06:40:27 +0100
commitd5a5886ce90a30efc830b0053472735c5bbb4b0f (patch)
tree4b2fff9fb8cd3f38490941a691fc4efeb46fcb19
parent6bb8c66c8ba9adca79c79797a587dc1fd939a784 (diff)
downloadvim-git-d5a5886ce90a30efc830b0053472735c5bbb4b0f.tar.gz
patch 8.1.0997: using GUI colors in vim.exe when 'termguicolors' is offv8.1.0997
Problem: Using GUI colors in vim.exe when 'termguicolors' is off. Solution: Add condition for 'termguicolors' set. (Ken Takata, closes #4078)
-rw-r--r--src/os_win32.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index df6f7db78..876a7a409 100644
--- 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 e1c8c61da..539a1e10d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 997,
+/**/
996,
/**/
995,