diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-05 21:10:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-05 21:10:59 +0200 |
| commit | 973fced7632fcbc2856aa842d5d872b6472f523c (patch) | |
| tree | 6b98b3b255484cff0d677fc1b404f98bc1e18f23 | |
| parent | d4209d203ac77e8c9debcc152557d80b4357aaae (diff) | |
| download | vim-git-973fced7632fcbc2856aa842d5d872b6472f523c.tar.gz | |
updated for version 7.3.1125v7.3.1125
Problem: Error for using \%V in a pattern in tiny Vim.
Solution: Allow using \%V but never match. (Dominique Pelle)
| -rw-r--r-- | src/regexp_nfa.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index e7db49930..947b2e725 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -184,9 +184,7 @@ 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,11 +961,9 @@ nfa_regatom() EMIT(NFA_CURSOR); break; -#ifdef FEAT_VISUAL case 'V': EMIT(NFA_VISUAL); break; -#endif case '[': { @@ -1976,9 +1972,7 @@ 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; @@ -4093,9 +4087,7 @@ failure_chance(state, depth) case NFA_VCOL_LT: case NFA_MARK_GT: case NFA_MARK_LT: -#ifdef FEAT_VISUAL case NFA_VISUAL: -#endif /* before/after positions don't match very often */ return 85; @@ -5036,14 +5028,14 @@ nfa_regmatch(prog, start, submatch, m) t->pim, &listidx); break; -#ifdef FEAT_VISUAL case NFA_VISUAL: +#ifdef FEAT_VISUAL result = reg_match_visual(); if (result) addstate_here(thislist, t->state->out, &t->subs, t->pim, &listidx); - break; #endif + break; default: /* regular character */ { diff --git a/src/version.c b/src/version.c index 40f3df861..bd19cfdc7 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 */ /**/ + 1125, +/**/ 1124, /**/ 1123, |