diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-24 16:59:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 16:59:14 -0400 |
| commit | a282a177d3320db25fa8f854cbcdbe0bc6abde7f (patch) | |
| tree | 137f0f1babdd1fc776f4b63a275604f7c526841d /src/nvim/screen.c | |
| parent | 0a653f7ab98dfc05bf0532b9f81bc19377031900 (diff) | |
| parent | 370e65ed7cb299b49306e96f13cf6b5c7f717a6c (diff) | |
| download | rneovim-a282a177d3320db25fa8f854cbcdbe0bc6abde7f.tar.gz rneovim-a282a177d3320db25fa8f854cbcdbe0bc6abde7f.tar.bz2 rneovim-a282a177d3320db25fa8f854cbcdbe0bc6abde7f.zip | |
Merge pull request #14634 from janlazo/vim-8.2.2880
vim-patch:8.2.{511,1689,1957,2880,2884}
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 5151d82c1b..90ac4ac7aa 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -4138,9 +4138,16 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, // highlight the cursor position itself. // Also highlight the 'colorcolumn' if it is different than // 'cursorcolumn' + // Also highlight the 'colorcolumn' if 'breakindent' and/or 'showbreak' + // options are set vcol_save_attr = -1; - if (draw_state == WL_LINE && !lnum_in_visual_area - && search_attr == 0 && area_attr == 0) { + if ((draw_state == WL_LINE + || draw_state == WL_BRI + || draw_state == WL_SBR) + && !lnum_in_visual_area + && search_attr == 0 + && area_attr == 0 + && filler_todo <= 0) { if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol && lnum != wp->w_cursor.lnum) { vcol_save_attr = char_attr; |