aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.1957: diff and cursorcolumn highlighting don't mix

Browse Source 
Problem:    Diff and cursorcolumn highlighting don't mix.
Solution:   Fix condition for what attribute to use. (Christian Brabandt,
            closes #7258, closes #7260)
This commit is contained in:
Bram Moolenaar
2020-11-05 19:07:21 +01:00
parent b4d16cb11d
commit fabc3ca896
7 changed files with 121 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/drawline.c
View File

@@ -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)