Mercurial > vim

changeset 4811:9909e44879b9 v7.3.1152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1152 Problem: In tiny build ireg_icombine is undefined. (Tony Mechelynck) Solution: Add #ifdef.
author Bram Moolenaar <bram@vim.org>
date Sat, 08 Jun 2013 23:30:04 +0200
parents 47466036eff2
children 99c9dd23883f
files src/regexp_nfa.c src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
     }
 
--- 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,