From 88c47aa692a4b1061f86624ea2503f31314f3975 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 26 Jun 2019 00:34:15 +0200
Subject: [PATCH] patch 8.1.1595: MS-Windows with VIMDLL: colors wrong in
 console

Problem:    MS-Windows with VIMDLL: colors wrong in console.
Solution:   Do not set the GUI colors when not using the GUI. (Ken Takata,
            closes #4588)
---
 src/syntax.c  | 4 ++++
 src/version.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/syntax.c b/src/syntax.c
index 756d0ea65..8c23d20a3 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -9554,6 +9554,10 @@ set_hl_attr(
 	at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg;
 # ifdef FEAT_TERMGUICOLORS
 #  ifdef MSWIN
+#   ifdef VIMDLL
+	// Only when not using the GUI.
+	if (!gui.in_use && !gui.starting)
+#   endif
 	{
 	    int id;
 	    guicolor_T fg, bg;
diff --git a/src/version.c b/src/version.c
index 369962921..0631f09b2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1595,
 /**/
     1594,
 /**/
-- 
2.50.1