comparison src/highlight.c @ 20705:5481c982a279 v8.2.0906

patch 8.2.0906: when setting 'termguicolors' SpellBad is no longer red Commit: https://github.com/vim/vim/commit/ea563cc22be043ff91dcbdf2878c3d1fd944e573 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jun 5 19:36:57 2020 +0200 patch 8.2.0906: when setting 'termguicolors' SpellBad is no longer red Problem: When setting 'termguicolors' SpellBad is no longer red. Solution: Only use the RGB guisp color for cterm when using the "underline" or "undercurl" attributes to avoid the background color to be cleared. Also make t_8u empty when the termresponse indicates a real xterm. (closes #6207)
author Bram Moolenaar <Bram@vim.org>
date Fri, 05 Jun 2020 19:45:03 +0200
parents 02f648f1c8fa
children d9a2e5dcfd9f
comparison
equal deleted inserted replaced
20704:487481a57366 20705:5481c982a279
2927 2927
2928 } 2928 }
2929 # endif 2929 # endif
2930 at_en.ae_u.cterm.fg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_fg); 2930 at_en.ae_u.cterm.fg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_fg);
2931 at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_bg); 2931 at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_bg);
2932 at_en.ae_u.cterm.ul_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_sp); 2932 // Only use the underline/undercurl color when used, it may clear the
2933 // background color if not supported.
2934 if (sgp->sg_cterm & (HL_UNDERLINE | HL_UNDERCURL))
2935 at_en.ae_u.cterm.ul_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_sp);
2936 else
2937 at_en.ae_u.cterm.ul_rgb = INVALCOLOR;
2933 if (at_en.ae_u.cterm.fg_rgb == INVALCOLOR 2938 if (at_en.ae_u.cterm.fg_rgb == INVALCOLOR
2934 && at_en.ae_u.cterm.bg_rgb == INVALCOLOR) 2939 && at_en.ae_u.cterm.bg_rgb == INVALCOLOR)
2935 { 2940 {
2936 // If both fg and bg are invalid fall back to the cterm colors. 2941 // If both fg and bg are invalid fall back to the cterm colors.
2937 // Helps when the GUI only uses an attribute, e.g. undercurl. 2942 // Helps when the GUI only uses an attribute, e.g. undercurl.