From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 27 May 2013 09:22:04 +0000 (+0200)
Subject: updated for version 7.3.1031
X-Git-Tag: v7.3.1031
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb3ecae23a458682ac572979515fcf343eaa62e5;p=vim

updated for version 7.3.1031
Problem:    Compiler warnings for shadowed variable. (John Little)
Solution:   Move the variable declarations to the scope where they are used.
---

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
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1031,
 /**/
     1030,
 /**/