Mercurial > vim
diff src/screen.c @ 16676:79c5f723bb5d v8.1.1340
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
commit https://github.com/vim/vim/commit/bfd451283f8c37926f4b0aa22b74b534bd84e482
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 17 13:05:07 2019 +0200
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Problem: Attributes from 'cursorline' overwrite textprop.
Solution: Combine the attributes. (closes https://github.com/vim/vim/issues/3912)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 17 May 2019 13:15:05 +0200 |
| parents | 8abd2cb8441c |
| children | ef00b6bc186b |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -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)