diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-05 19:07:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-05 19:07:21 +0100 |
| commit | fabc3ca896751277f18a3a68e5661179728db3ad (patch) | |
| tree | ca34187afd2c6247d7a9139edb3146317472594a /src/drawline.c | |
| parent | b4d16cb11d92b363503b71673921774548230e94 (diff) | |
patch 8.2.1957: diff and cursorcolumn highlighting don't mixv8.2.1957
Problem: Diff and cursorcolumn highlighting don't mix.
Solution: Fix condition for what attribute to use. (Christian Brabandt,
closes #7258, closes #7260)
Diffstat (limited to 'src/drawline.c')
| -rw-r--r-- | src/drawline.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/drawline.c b/src/drawline.c index 82738f13cd..6b9cbc6287 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -1873,6 +1873,7 @@ win_line( char_u *prev_ptr, *p; int len; hlf_T spell_hlf = HLF_COUNT; + if (has_mbyte) { prev_ptr = ptr - mb_l; @@ -2778,10 +2779,14 @@ win_line( // Also highlight the 'colorcolumn' if 'breakindent' and/or 'showbreak' // options are set vcol_save_attr = -1; - if ((draw_state == WL_LINE || + if (((draw_state == WL_LINE || draw_state == WL_BRI || draw_state == WL_SBR) && !lnum_in_visual_area && search_attr == 0 && area_attr == 0) +# ifdef FEAT_DIFF + && filler_todo <= 0 +# endif + ) { if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol && lnum != wp->w_cursor.lnum) |