From aff5c3a5304d85b53b00fd67418d53056b663ba9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 13 Dec 2014 03:36:39 +0100 Subject: [PATCH] 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) --- src/screen.c | 8 +++++++- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 545, /**/ 544, /**/ -- 2.40.0