From d560014e032e0646234a56af18ae1bfa6c1f5c90 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Thu, 5 May 2022 21:09:54 +0100 Subject: 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) --- src/highlight.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/highlight.c') diff --git a/src/highlight.c b/src/highlight.c index 1e6f9c7066..3f46a07276 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -3283,27 +3283,6 @@ set_hl_attr( 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 -- cgit v1.2.3