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)

diff --git a/src/screen.c b/src/screen.c
index d3951386282a2e5be242ae445d7f5b5fe82e6d51..e7b8e78d78006ae4ffedfa068b9281ec15f31cbb 100644 (file)
--- 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 ba5f6b3bf0c6755be16f80059ae3d0423bf6d303..1d63121acde9c20dcf3b7833c751a96e9459410d 100644 (file)
--- 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,
 /**/