diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-12-13 03:36:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-12-13 03:36:39 +0100 |
| commit | aff5c3a5304d85b53b00fd67418d53056b663ba9 (patch) | |
| tree | bd0e258743c7b508a1fb8097036c0f9e2eae26eb /src | |
| parent | d96c52c71b85d848f23f58dfb8463279a39bfe84 (diff) | |
| download | vim-aff5c3a5304d85b53b00fd67418d53056b663ba9.zip | |
updated for version 7.4.545
Problem: Highlighting for multi-line matches is not correct.
Solution: Stop highlight at the end of the match. (Hirohito Higashi)
Diffstat (limited to 'src')
| -rw-r--r-- | src/screen.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index d39513862..e7b8e78d7 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3864,9 +3864,15 @@ win_line(wp, lnum, startrow, endrow, nochange) && v >= (long)shl->startcol && v < (long)shl->endcol) { +#ifdef FEAT_MBYTE + int tmp_col = v + MB_PTR2LEN(ptr); + + if (shl->endcol < tmp_col) + shl->endcol = tmp_col; +#endif shl->attr_cur = shl->attr; } - else if (v >= (long)shl->endcol && shl->lnum == lnum) + else if (v == (long)shl->endcol) { shl->attr_cur = 0; next_search_hl(wp, shl, lnum, (colnr_T)v, cur); diff --git a/src/version.c b/src/version.c index ba5f6b3bf..1d63121ac 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 545, +/**/ 544, /**/ 543, |