Mercurial > vim
diff src/drawline.c @ 22818:b27601c0d289 v8.2.1957
patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Commit: https://github.com/vim/vim/commit/fabc3ca896751277f18a3a68e5661179728db3ad
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 5 19:07:21 2020 +0100
patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Problem: Diff and cursorcolumn highlighting don't mix.
Solution: Fix condition for what attribute to use. (Christian Brabandt,
closes #7258, closes #7260)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 05 Nov 2020 19:15:03 +0100 |
| parents | 47ebfc274e3f |
| children | 38324d4f1c94 |
line wrap: on
line diff
--- 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)