From 4f36dc3bf7118a3fa5ccdae1a37963860dc71e6c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 5 Mar 2015 17:16:06 +0100 Subject: 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) --- src/regexp_nfa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/regexp_nfa.c') 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) -- cgit v1.2.1