From a940aa6fc44c18e012bf66e1f2569c046132d509 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 8 Jun 2013 23:30:04 +0200 Subject: [PATCH] updated for version 7.3.1152 Problem: In tiny build ireg_icombine is undefined. (Tony Mechelynck) Solution: Add #ifdef. --- src/regexp_nfa.c | 6 +++++- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 5c6e986f4..2c2e9dee3 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -6198,7 +6198,11 @@ nfa_regexec_both(line, startcol) /* If match_text is set it contains the full text that must match. * Nothing else to try. Doesn't handle combining chars well. */ - if (prog->match_text != NULL && !ireg_icombine) + if (prog->match_text != NULL +#ifdef FEAT_MBYTE + && !ireg_icombine +#endif + ) return find_match_text(col, prog->regstart, prog->match_text); } diff --git a/src/version.c b/src/version.c index a442ecb96..7587256a8 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1152, /**/ 1151, /**/