summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-04 21:42:22 +0200
committerBram Moolenaar <bram@vim.org>2013-06-04 21:42:22 +0200
commita34b279dbb8c6dcf7b8554233e44f0fcc07738f3 (patch)
tree9e5be68e4545d4a7e341ca38572f0e6bed2e861b
parente98a6c99db2b86305aefd223cb85179827cb0ad5 (diff)
downloadvim-a34b279dbb8c6dcf7b8554233e44f0fcc07738f3.tar.gz
updated for version 7.3.1114v7.3.1114v7-3-1114
Problem: Can't build without the syntax feature. Solution: Add #ifdefs. (Erik Falor)
-rw-r--r--src/regexp_nfa.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 225b7d42..4ad3191a 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -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
diff --git a/src/version.c b/src/version.c
index 35c88070..a2d70370 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 */
/**/
+ 1114,
+/**/
1113,
/**/
1112,