# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1370727004 -7200
# Node ID 9909e44879b9f80679fd05af19a423b2673b2301
# Parent  47466036eff2e28d1e8da3fca12366dc20becbb7
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
--- 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
--- 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,