Mercurial > vim
diff src/screen.c @ 7287:6fcadba9ec7a v7.4.949
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 3 14:29:02 2015 +0100
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 03 Dec 2015 14:30:04 +0100 |
| parents | 9487ea110214 |
| children | 68f2cac6b0db |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -5422,7 +5422,12 @@ win_line(wp, lnum, startrow, endrow, noc 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)