updated for version 7.3.1152

Problem:    In tiny build ireg_icombine is undefined. (Tony Mechelynck)
Solution:   Add #ifdef.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 5c6e986f4f82fae32aa2e4c66462dc1591b53da3..2c2e9dee3ecbd9a313679aca11dcf68f8ed47ae4 100644 (file)
--- 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 a442ecb96662a20c46fa02db2d1eb1dbf6d09990..7587256a80504dba0102d17f69e49e76ceb78e32 100644 (file)
--- 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,
 /**/