Mercurial > vim
changeset 28706:c655908382fa v8.2.4877
patch 8.2.4877: MS-Windows: Wrongly using Normal colors for termguicolors
Commit: https://github.com/vim/vim/commit/d560014e032e0646234a56af18ae1bfa6c1f5c90
Author: Christian Brabandt <cb@256bit.org>
Date: Thu May 5 21:09:54 2022 +0100
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 05 May 2022 22:15:03 +0200 |
parents | eb700e5576bd |
children | 0c46a01e5d5c |
files | src/highlight.c src/version.c |
diffstat | 2 files changed, 2 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- 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