diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-03 14:29:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-03 14:29:02 +0100 |
| commit | 32a214e78df0120f92fe049eab1385c60f0cdb0b (patch) | |
| tree | e17b9ddd6ca8ac2494e70105de2eb9e36e58ebdf /src/screen.c | |
| parent | 20ad69ccfb60ef718bd26387ef0e5424461a643e (diff) | |
| download | vim-git-32a214e78df0120f92fe049eab1385c60f0cdb0b.tar.gz | |
patch 7.4.949v7.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)
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) |