diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-05-27 11:22:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-05-27 11:22:04 +0200 |
| commit | eb3ecae23a458682ac572979515fcf343eaa62e5 (patch) | |
| tree | 40759e1ed04be18f52dafefcc60dbbbceee9add2 /src | |
| parent | 2cb8feb880655905f392619c70962837266bcd5d (diff) | |
| download | vim-git-eb3ecae23a458682ac572979515fcf343eaa62e5.tar.gz | |
updated for version 7.3.1031v7.3.1031
Problem: Compiler warnings for shadowed variable. (John Little)
Solution: Move the variable declarations to the scope where they are used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/regexp_nfa.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 1d992a9a0..08375234c 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -2999,7 +2999,6 @@ nfa_regmatch(start, submatch, m) nfa_list_T *nextlist; nfa_list_T *neglist; int *listids = NULL; - int j = 0; #ifdef NFA_REGEXP_DEBUG_LOG FILE *debug = fopen(NFA_REGEXP_DEBUG_LOG, "a"); @@ -3149,6 +3148,9 @@ nfa_regmatch(start, submatch, m) switch (t->state->c) { case NFA_MATCH: + { + int j; + nfa_match = TRUE; submatch->in_use = t->sub.in_use; if (REG_MULTI) @@ -3186,6 +3188,7 @@ nfa_regmatch(start, submatch, m) if (nextlist->n == 0 && neglist->n == 0) clen = 0; goto nextchar; + } case NFA_END_INVISIBLE: /* This is only encountered after a NFA_START_INVISIBLE node. @@ -3251,6 +3254,8 @@ nfa_regmatch(start, submatch, m) #endif if (result == TRUE) { + int j; + /* Restore position in input text */ reginput = old_reginput; regline = old_regline; diff --git a/src/version.c b/src/version.c index 6170d7ca3..c9325b3e7 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 */ /**/ + 1031, +/**/ 1030, /**/ 1029, |