# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1458326704 -3600
# Node ID 46306a98407c48f1a228ad1d4af4a09f06d6bde2
# Parent  5ebc0b775fb700eff1e0d38149173b9bf146a6c1
commit https://github.com/vim/vim/commit/3f242a844e83a5a04943869f6e3bcbf8650dc465
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Mar 18 19:39:25 2016 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1590,
+/**/
     1589,
 /**/
     1588,