summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-05 11:02:05 +0200
committerBram Moolenaar <bram@vim.org>2013-06-05 11:02:05 +0200
commit645eaceeff92dc03e411fa662870b06adf8f31d8 (patch)
tree7b0dbbd95c3aef09db415c5c908c8e3229cf423f
parent2a8bac3171644d30a11b57f5196815d0605b6ac3 (diff)
downloadvim-645eaceeff92dc03e411fa662870b06adf8f31d8.tar.gz
updated for version 7.3.1116v7.3.1116v7-3-1116
Problem: Can't build without Visual mode. Solution: Add #ifdefs.
-rw-r--r--src/regexp_nfa.c8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 4ad3191a..0e804c2e 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -181,7 +181,9 @@ enum
NFA_MARK, /* Match mark */
NFA_MARK_GT, /* Match > mark */
NFA_MARK_LT, /* Match < mark */
+#ifdef FEAT_VISUAL
NFA_VISUAL, /* Match Visual area */
+#endif
NFA_FIRST_NL = NFA_ANY + ADD_NL,
NFA_LAST_NL = NFA_NUPPER + ADD_NL,
@@ -963,9 +965,11 @@ nfa_regatom()
EMIT(NFA_CURSOR);
break;
+#ifdef FEAT_VISUAL
case 'V':
EMIT(NFA_VISUAL);
break;
+#endif
case '[':
/* TODO: \%[abc] not supported yet */
@@ -1955,7 +1959,9 @@ nfa_set_code(c)
case NFA_MARK_GT: STRCPY(code, "NFA_MARK_GT "); break;
case NFA_MARK_LT: STRCPY(code, "NFA_MARK_LT "); break;
case NFA_CURSOR: STRCPY(code, "NFA_CURSOR "); break;
+#ifdef FEAT_VISUAL
case NFA_VISUAL: STRCPY(code, "NFA_VISUAL "); break;
+#endif
case NFA_STAR: STRCPY(code, "NFA_STAR "); break;
case NFA_STAR_NONGREEDY: STRCPY(code, "NFA_STAR_NONGREEDY "); break;
@@ -4790,12 +4796,14 @@ nfa_regmatch(prog, start, submatch, m)
t->pim, &listidx);
break;
+#ifdef FEAT_VISUAL
case NFA_VISUAL:
result = reg_match_visual();
if (result)
addstate_here(thislist, t->state->out, &t->subs,
t->pim, &listidx);
break;
+#endif
default: /* regular character */
{
diff --git a/src/version.c b/src/version.c
index cf536b8d..3677adcf 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 */
/**/
+ 1116,
+/**/
1115,
/**/
1114,