patch 7.4.1590

brammool · brammool · commit 3f242a844e83 · 2016-03-18T19:39:25.000+01:00
Problem:    Warning for shadowed variable. (Christian Brabandt)
Solution:   Move the variable into a local block.
diff --git a/src/eval.c b/src/eval.c
@@ -21660,7 +21660,6 @@ handle_subscript(
     char_u	*s;
     int		len;
     typval_T	functv;
-    partial_T	*pt = NULL;
 
     while (ret == OK
 	    && (**arg == '['
@@ -21671,6 +21670,8 @@ handle_subscript(
     {
 	if (**arg == '(')
 	{
+	    partial_T	*pt = NULL;
+
 	    /* need to copy the funcref so that we can clear rettv */
 	    if (evaluate)
 	    {
diff --git a/src/version.c b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1590,
 /**/
     1589,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -21660,7 +21660,6 @@ handle_subscript(`
`21660`	`21660`	`char_u *s;`
`21661`	`21661`	`int len;`
`21662`	`21662`	`typval_T functv;`
`21663`		`- partial_T *pt = NULL;`
`21664`	`21663`
`21665`	`21664`	`while (ret == OK`
`21666`	`21665`	`&& (**arg == '['`
`@@ -21671,6 +21670,8 @@ handle_subscript(`
`21671`	`21670`	`{`
`21672`	`21671`	`if (**arg == '(')`
`21673`	`21672`	`{`
	`21673`	`+ partial_T *pt = NULL;`
	`21674`	`+`
`21674`	`21675`	`/* need to copy the funcref so that we can clear rettv */`
`21675`	`21676`	`if (evaluate)`
`21676`	`21677`	`{`