patch 7.4.1590

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
index 3db58f8d805f4f6bc90854fc4ef1f1cbef1fe09a..5fc4bd4ff329a569c152d8e78b941d46ab53bc9b 100644 (file)
--- 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
index 6e448f2d0ffdd7bf8a048132f27a840e15b6035c..a64d6080ff7f36f515d8c193702541447b907d76 100644 (file)
--- 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,
 /**/