From 32a214e78df0120f92fe049eab1385c60f0cdb0b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 3 Dec 2015 14:29:02 +0100 Subject: patch 7.4.949 Problem: When using 'colorcolumn' and there is a sign with a fullwidth character the highlighting is wrong. (Andrew Stewart) Solution: Only increment vcol when in the right state. (Christian Brabandt) --- src/screen.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/screen.c') diff --git a/src/screen.c b/src/screen.c index d80ad6f96..581638157 100644 --- a/src/screen.c +++ b/src/screen.c @@ -5422,7 +5422,12 @@ win_line(wp, lnum, startrow, endrow, nochange) else /* DBCS: Put second byte in the second screen char. */ ScreenLines[off] = mb_c & 0xff; - ++vcol; + if (draw_state > WL_NR +#ifdef FEAT_DIFF + && filler_todo <= 0 +#endif + ) + ++vcol; /* When "tocol" is halfway a character, set it to the end of * the character, otherwise highlighting won't stop. */ if (tocol == vcol) -- cgit v1.2.1