Mercurial > vim

changeset 8601:46306a98407c v7.4.1590

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Christian Brabandt <cb@256bit.org>
date Fri, 18 Mar 2016 19:45:04 +0100
parents 5ebc0b775fb7
children f4058c704b7a
files src/eval.c src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
 	    {
--- 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,