]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.1114 v7.3.1114
authorBram Moolenaar <Bram@vim.org>
Tue, 4 Jun 2013 19:42:22 +0000 (21:42 +0200)
committerBram Moolenaar <Bram@vim.org>
Tue, 4 Jun 2013 19:42:22 +0000 (21:42 +0200)
Problem:    Can't build without the syntax feature.
Solution:   Add #ifdefs. (Erik Falor)

src/regexp_nfa.c
src/version.c

index 225b7d42bf6b4d398c84786f219219fe544f10d2..4ad3191a1c3962c339ef21f770fb1fb0c894d411 100644 (file)
@@ -3907,7 +3907,9 @@ failure_chance(state, depth)
     if (c > 0)
        return 99;
     if ((c >= NFA_MOPEN && c <= NFA_MOPEN9)
+#ifdef FEAT_SYN_HL
            || (c >= NFA_ZOPEN && c <= NFA_ZOPEN9)
+#endif
            || c == NFA_NOPEN)
        return failure_chance(state->out, depth + 1);
     /* something else */
@@ -4201,7 +4203,9 @@ nfa_regmatch(prog, start, submatch, m)
                     * Otherwise first do the one that has the highest chance
                     * of failing. */
                    if ((cout >= NFA_MCLOSE && cout <= NFA_MCLOSE9)
+#ifdef FEAT_SYN_HL
                            || (cout >= NFA_ZCLOSE && cout <= NFA_ZCLOSE9)
+#endif
                            || cout == NFA_NCLOSE
                            || t->pim != NULL
                            || (t->state->c != NFA_START_INVISIBLE_BEFORE
index 35c8807075d9b4c6647ebae463142006196ed520..a2d70370b9265a57122e92c41c3e75a4d75c6d07 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1114,
 /**/
     1113,
 /**/