summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-26 00:34:15 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-26 00:34:15 +0200
commit88c47aa692a4b1061f86624ea2503f31314f3975 (patch)
tree4a9d57d8f3a24a7c2eddcc78e8216fc1e88b26a2
parent2eed9bafa013f278ffe8bcd52489f90b11cf00e1 (diff)
downloadvim-git-8.1.1595.tar.gz
patch 8.1.1595: MS-Windows with VIMDLL: colors wrong in consolev8.1.1595
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)
-rw-r--r--src/syntax.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
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
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1595,
+/**/
1594,
/**/
1593,