diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-13 20:17:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-13 20:17:34 +0100 |
| commit | 9113c2cd19c72c0973ee5dc095a0a7f03f2af344 (patch) | |
| tree | 60f81d11aabff26ee162252f6d08ae7354a61f9e /src/drawline.c | |
| parent | 8f369fb1ab7debeeda0fec69c379c528d162d9c5 (diff) | |
patch 9.0.0201: CursorLine highlight overrules virtual text highlightv9.0.0201
Problem: CursorLine highlight overrules virtual text highlight.
Solution: Let extra attribute overrule line attribute. (closes #10909)
Diffstat (limited to 'src/drawline.c')
| -rw-r--r-- | src/drawline.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/drawline.c b/src/drawline.c index 247ed29d84..a129bae420 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -1638,7 +1638,8 @@ win_line( & TP_FLAG_ALIGN_BELOW))) : bcol >= text_props[text_prop_next].tp_col - 1)) { - if (bcol <= text_props[text_prop_next].tp_col - 1 + if (text_props[text_prop_next].tp_col == MAXCOL + || bcol <= text_props[text_prop_next].tp_col - 1 + text_props[text_prop_next].tp_len) text_prop_idxs[text_props_active++] = text_prop_next; ++text_prop_next; @@ -2989,7 +2990,7 @@ win_line( { #ifdef LINE_ATTR if (line_attr) - wlv.char_attr = hl_combine_attr(extra_attr, line_attr); + wlv.char_attr = hl_combine_attr(line_attr, extra_attr); else #endif wlv.char_attr = extra_attr; |