aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-28 09:27:14 -04:00
Code Activity

patch 8.1.2071: when 'wincolor' is set text property changes highlighting

Browse Source 
Problem:    When 'wincolor' is set text property changes highlighting. (Andy
            Stewart)
Solution:   Fix combining colors. (closes #4968)
This commit is contained in:
Bram Moolenaar
2019-09-23 22:17:15 +02:00
parent b8ff5c271e
commit 053f712ef2
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/drawline.c
View File

@@ -1367,6 +1367,7 @@ win_line(
text_prop_attr = 0;
text_prop_combine = FALSE;
text_prop_type = NULL;
if (text_props_active > 0)
{
// Sort the properties on priority and/or starting last.
@@ -1406,8 +1407,11 @@ win_line(
# ifdef FEAT_TEXT_PROP
else if (text_prop_type != NULL)
{
char_attr = hl_combine_attr(
line_attr != 0 ? line_attr : win_attr, text_prop_attr);
char_attr = hl_combine_attr(line_attr != 0
? line_attr
: syntax_attr != 0
? syntax_attr
: win_attr, text_prop_attr);
}
# endif
else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)