Mercurial > vim
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 7286:98cf372a9d0e | 7287:6fcadba9ec7a |
|---|---|
| 5420 /* UTF-8: Put a 0 in the second screen char. */ | 5420 /* UTF-8: Put a 0 in the second screen char. */ |
| 5421 ScreenLines[off] = 0; | 5421 ScreenLines[off] = 0; |
| 5422 else | 5422 else |
| 5423 /* DBCS: Put second byte in the second screen char. */ | 5423 /* DBCS: Put second byte in the second screen char. */ |
| 5424 ScreenLines[off] = mb_c & 0xff; | 5424 ScreenLines[off] = mb_c & 0xff; |
| 5425 ++vcol; | 5425 if (draw_state > WL_NR |
| 5426 #ifdef FEAT_DIFF | |
| 5427 && filler_todo <= 0 | |
| 5428 #endif | |
| 5429 ) | |
| 5430 ++vcol; | |
| 5426 /* When "tocol" is halfway a character, set it to the end of | 5431 /* When "tocol" is halfway a character, set it to the end of |
| 5427 * the character, otherwise highlighting won't stop. */ | 5432 * the character, otherwise highlighting won't stop. */ |
| 5428 if (tocol == vcol) | 5433 if (tocol == vcol) |
| 5429 ++tocol; | 5434 ++tocol; |
| 5430 #ifdef FEAT_RIGHTLEFT | 5435 #ifdef FEAT_RIGHTLEFT |