averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.2.0034: redundant code in hl_blend_attr()

Browse Source 
Problem:  Redundant code in hl_blend_attr()
          (Coverity, after v9.2.0017)
Solution: Remove redundant if/else logic, remove redundant braces.

related: #19272

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2026-02-21 09:39:35 +00:00
parent d0fa375629
commit 2ab37c07a8
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/highlight.c
+1 -10
View File
@@ -3219,17 +3219,10 @@ hl_blend_attr(int char_attr, int popup_attr, int blend, int blend_fg UNUSED)
{
// Blend foreground color
if (popup_aep->ae_u.cterm.fg_color > 0)
{
if (new_en.ae_u.cterm.fg_color > 0)
new_en.ae_u.cterm.fg_color = popup_aep->ae_u.cterm.fg_color;
else
new_en.ae_u.cterm.fg_color = popup_aep->ae_u.cterm.fg_color;
}
new_en.ae_u.cterm.fg_color = popup_aep->ae_u.cterm.fg_color;
// Use popup background color (cterm colors don't support blending)
if (popup_aep->ae_u.cterm.bg_color > 0)
{
new_en.ae_u.cterm.bg_color = popup_aep->ae_u.cterm.bg_color;
}
#ifdef FEAT_TERMGUICOLORS
// Blend RGB colors for termguicolors mode
if (blend_fg)
@@ -3243,10 +3236,8 @@ hl_blend_attr(int char_attr, int popup_attr, int blend, int blend_fg UNUSED)
}
}
else if (popup_aep->ae_u.cterm.fg_rgb != INVALCOLOR)
{
// blend_fg=FALSE: use popup foreground
new_en.ae_u.cterm.fg_rgb = popup_aep->ae_u.cterm.fg_rgb;
}
if (popup_aep->ae_u.cterm.bg_rgb != INVALCOLOR)
{
// Always use popup background, fade to black based on blend
src/version.c
+2
View File
@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
34,
/**/
33,
/**/