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)

diff --git a/src/syntax.c b/src/syntax.c
index 756d0ea6569419e5c736cfe1d262d5c856437a9b..8c23d20a31526e7e952c6d68d2930e687c0f1705 100644 (file)
--- 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 369962921039c37df67ca8fbcabf97dd1dc87b4d..0631f09b2291dcfd9b716444b2779be810638b67 100644 (file)
--- 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,
 /**/