aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.2241: match highlight does not combine with 'wincolor'

Browse Source 
Problem:    Match highlight does not combine with 'wincolor'.
Solution:   Apply 'wincolor' last on top of any other attribute. (closes #5159)
This commit is contained in:
Bram Moolenaar
2019-11-02 22:00:15 +01:00
parent f2885d3fb7
commit 024dbd229f
7 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/drawline.c
View File

@@ -751,8 +751,6 @@ win_line(
win_attr = wcr_attr;
area_highlighting = TRUE;
}
if (vi_attr != 0 && win_attr != 0)
vi_attr = hl_combine_attr(win_attr, vi_attr);
#ifdef FEAT_TEXT_PROP
if (WIN_IS_POPUP(wp))
@@ -1444,10 +1442,6 @@ win_line(
prev_syntax_attr = syntax_attr;
}
// combine syntax attribute with 'wincolor'
if (syntax_attr != 0 && win_attr != 0)
syntax_attr = hl_combine_attr(win_attr, syntax_attr);
if (did_emsg)
{
wp->w_s->b_syn_error = TRUE;
@@ -1548,8 +1542,15 @@ win_line(
#endif
}
}
if (char_attr == 0)
char_attr = win_attr;
// combine attribute with 'wincolor'
if (win_attr != 0)
{
if (char_attr == 0)
char_attr = win_attr;
else
char_attr = hl_combine_attr(win_attr, char_attr);
}
// Get the next character to put on the screen.
@@ -3140,4 +3141,3 @@ win_line(
vim_free(p_extra_free);
return row;
}