From b0eb14f9392a8d95045182c4e520530319ce44c2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jun 2018 15:29:52 +0200
Subject: [PATCH] patch 8.1.0123: MS-Windows: colors are wrong after setting
 'notgc'

Problem:    MS-Windows: colors are wrong after setting 'notgc'.
Solution:   Only call control_console_color_rgb() for the win32 terminal.
            (Nobuhiro Takasaki, closes #3107)
---
 src/option.c  | 5 ++++-
 src/version.c | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/option.c b/src/option.c
index 1ba8a8c2e4260..4fdfe10008f9d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8819,10 +8819,13 @@ set_bool_option(
 # endif
 	    highlight_gui_started();
 # ifdef FEAT_VTP
-	control_console_color_rgb();
 	/* reset t_Co */
 	if (is_term_win32())
+	{
+	    control_console_color_rgb();
 	    set_termname(T_NAME);
+	    init_highlight(TRUE, FALSE);
+	}
 # endif
     }
 #endif
diff --git a/src/version.c b/src/version.c
index eb119ca2a0392..a2780f4707304 100644
--- a/src/version.c
+++ b/src/version.c
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    123,
 /**/
     122,
 /**/