updated for version 7.4.651

Problem:    Can't match "%>80v" properly for multi-byte characters.
Solution:   Multiply the character number by the maximum number of bytes in a
            character. (Yasuhiro Matsumoto)

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 2245351095b012055daf22944699598e5b61b888..e67f6380c13df8fdd00e6842aa2b99531b51c39b 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -6477,7 +6477,11 @@ nfa_regmatch(prog, start, submatch, m)
 
                    /* Bail out quickly when there can't be a match, avoid the
                     * overhead of win_linetabsize() on long lines. */
-                   if (op != 1 && col > t->state->val)
+                   if (op != 1 && col > t->state->val
+#ifdef FEAT_MBYTE
+                           * (has_mbyte ? MB_MAXBYTES : 1)
+#endif
+                           )
                        break;
                    result = FALSE;
                    if (op == 1 && col - 1 > t->state->val && col > 100)

diff --git a/src/version.c b/src/version.c
index 92fec408dfd2f4df4d26a2017b4e14b28c5cf970..cd788b00e1899507938494df62311559ce376270 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 */
+/**/
+    651,
 /**/
     650,
 /**/