diff options
| -rw-r--r-- | src/regexp_nfa.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
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 @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1152, +/**/ 1151, /**/ 1150, |