aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.1.1340: attributes from 'cursorline' overwrite textprop

Browse Source 
Problem:    Attributes from 'cursorline' overwrite textprop.
Solution:   Combine the attributes. (closes #3912)
This commit is contained in:
Bram Moolenaar
2019-05-17 13:05:07 +02:00
parent dabfde04fe
commit bfd451283f
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screen.c
View File

@@ -4306,11 +4306,15 @@ win_line(
char_attr = hl_combine_attr(line_attr, area_attr);
else if (search_attr != 0)
char_attr = hl_combine_attr(line_attr, search_attr);
/* Use line_attr when not in the Visual or 'incsearch' area
* (area_attr may be 0 when "noinvcur" is set). */
# ifdef FEAT_TEXT_PROP
else if (text_prop_type != NULL)
char_attr = hl_combine_attr(line_attr, text_prop_attr);
# endif
else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
|| vcol < fromcol || vcol_prev < fromcol_prev
|| vcol >= tocol))
// Use line_attr when not in the Visual or 'incsearch' area
// (area_attr may be 0 when "noinvcur" is set).
char_attr = line_attr;
#else
if (area_attr != 0)