From: Bram Moolenaar Date: Fri, 18 Mar 2016 18:39:25 +0000 (+0100) Subject: patch 7.4.1590 X-Git-Tag: v7.4.1590 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f242a844e83a5a04943869f6e3bcbf8650dc465;p=vim 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 3db58f8d8..5fc4bd4ff 100644 --- 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 6e448f2d0..a64d6080f 100644 --- 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, /**/