]> granicus.if.org Git - vim/commitdiff
patch 8.1.0123: MS-Windows: colors are wrong after setting 'notgc' v8.1.0123
authorBram Moolenaar <Bram@vim.org>
Thu, 28 Jun 2018 13:29:52 +0000 (15:29 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 28 Jun 2018 13:29:52 +0000 (15:29 +0200)
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
src/version.c

index 1ba8a8c2e426073e2a9cd69879614e5dff625948..4fdfe10008f9db5245c9230d6c5041640c704aca 100644 (file)
@@ -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
index eb119ca2a039253f29928f4246cb73c90d0275cf..a2780f47073046f7955cb9c0ffe76e2fcbbb7338 100644 (file)
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    123,
 /**/
     122,
 /**/