patch 8.2.4877: MS-Windows: Wrongly using Normal colors for termguicolors
Problem: MS-Windows: Using Normal colors for termguicolors causes problems.
Solution: Do not use Normal colors to set sg_gui_fg and sg_gui_bg.
(Christian Brabandt, closes #10317, closes #10241)
diff --git a/src/highlight.c b/src/highlight.c
index 1e6f9c7..3f46a07 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -3283,27 +3283,6 @@
at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg;
at_en.ae_u.cterm.ul_color = sgp->sg_cterm_ul;
# 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;
-
- id = syn_name2id((char_u *)"Normal");
- if (id > 0)
- {
- syn_id2colors(id, &fg, &bg);
- if (sgp->sg_gui_fg == INVALCOLOR)
- sgp->sg_gui_fg = fg;
- if (sgp->sg_gui_bg == INVALCOLOR)
- sgp->sg_gui_bg = bg;
- }
-
- }
-# endif
at_en.ae_u.cterm.fg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_fg);
at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_bg);
// Only use the underline/undercurl color when used, it may clear the
diff --git a/src/version.c b/src/version.c
index 535d4eb..e3aa288 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4877,
+/**/
4876,
/**/
4875,