From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 5 Mar 2015 16:16:06 +0000 (+0100)
Subject: updated for version 7.4.651
X-Git-Tag: v7.4.651
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f36dc3bf7118a3fa5ccdae1a37963860dc71e6c;p=vim

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 224535109..e67f6380c 100644
--- 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 92fec408d..cd788b00e 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 */
+/**/
+    651,
 /**/
     650,
 /**/