aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

updated for version 7.3.1125

Browse Source 
Problem:    Error for using \%V in a pattern in tiny Vim.
Solution:   Allow using \%V but never match. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar 2013-06-05 21:10:59 +02:00
parent d4209d203a
commit 973fced763
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/regexp_nfa.c
View File

@ -184,9 +184,7 @@ enum
NFA_MARK, /* Match mark */ NFA_MARK, /* Match mark */
NFA_MARK_GT, /* Match > mark */ NFA_MARK_GT, /* Match > mark */
NFA_MARK_LT, /* Match < mark */ NFA_MARK_LT, /* Match < mark */
#ifdef FEAT_VISUAL
NFA_VISUAL, /* Match Visual area */ NFA_VISUAL, /* Match Visual area */
#endif
NFA_FIRST_NL = NFA_ANY + ADD_NL, NFA_FIRST_NL = NFA_ANY + ADD_NL,
NFA_LAST_NL = NFA_NUPPER + ADD_NL, NFA_LAST_NL = NFA_NUPPER + ADD_NL,
@ -963,11 +961,9 @@ nfa_regatom()
EMIT(NFA_CURSOR); EMIT(NFA_CURSOR);
break; break;
#ifdef FEAT_VISUAL
case 'V': case 'V':
EMIT(NFA_VISUAL); EMIT(NFA_VISUAL);
break; break;
#endif
case '[': case '[':
{ {
@ -1976,9 +1972,7 @@ nfa_set_code(c)
case NFA_MARK_GT: STRCPY(code, "NFA_MARK_GT "); break; case NFA_MARK_GT: STRCPY(code, "NFA_MARK_GT "); break;
case NFA_MARK_LT: STRCPY(code, "NFA_MARK_LT "); break; case NFA_MARK_LT: STRCPY(code, "NFA_MARK_LT "); break;
case NFA_CURSOR: STRCPY(code, "NFA_CURSOR "); break; case NFA_CURSOR: STRCPY(code, "NFA_CURSOR "); break;
#ifdef FEAT_VISUAL
case NFA_VISUAL: STRCPY(code, "NFA_VISUAL "); break; case NFA_VISUAL: STRCPY(code, "NFA_VISUAL "); break;
#endif
case NFA_STAR: STRCPY(code, "NFA_STAR "); break; case NFA_STAR: STRCPY(code, "NFA_STAR "); break;
case NFA_STAR_NONGREEDY: STRCPY(code, "NFA_STAR_NONGREEDY "); 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_VCOL_LT:
case NFA_MARK_GT: case NFA_MARK_GT:
case NFA_MARK_LT: case NFA_MARK_LT:
#ifdef FEAT_VISUAL
case NFA_VISUAL: case NFA_VISUAL:
#endif
/* before/after positions don't match very often */ /* before/after positions don't match very often */
return 85; return 85;
@ -5036,14 +5028,14 @@ nfa_regmatch(prog, start, submatch, m)
t->pim, &listidx); t->pim, &listidx);
break; break;
#ifdef FEAT_VISUAL
case NFA_VISUAL: case NFA_VISUAL:
#ifdef FEAT_VISUAL
result = reg_match_visual(); result = reg_match_visual();
if (result) if (result)
addstate_here(thislist, t->state->out, &t->subs, addstate_here(thislist, t->state->out, &t->subs,
t->pim, &listidx); t->pim, &listidx);
break;
#endif #endif
break;
default: /* regular character */ default: /* regular character */
{ {

2
src/version.c
View File

@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1125,
/**/ /**/
1124, 1124,
/**/ /**/