From fabc3ca896751277f18a3a68e5661179728db3ad Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 5 Nov 2020 19:07:21 +0100
Subject: 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)
---
 src/drawline.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/drawline.c')

diff --git a/src/drawline.c b/src/drawline.c
index 82738f13c..6b9cbc628 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)
-- 
cgit v1.2.1