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)
diff --git a/src/drawline.c b/src/drawline.c
index 82738f1..6b9cbc6 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1873,6 +1873,7 @@
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 @@
// 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)