diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-10-27 13:51:04 -0700 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-12 10:17:35 -0500 |
| commit | 86706011a67efb3e248691bf2391355d0e0e7d50 (patch) | |
| tree | 34c2b68c4adaeb2c1a2074a3022fb36ab72020dc /src | |
| parent | 531249a4acdef36ed44e8bbf1355f2a80a5792a5 (diff) | |
| download | rneovim-86706011a67efb3e248691bf2391355d0e0e7d50.tar.gz rneovim-86706011a67efb3e248691bf2391355d0e0e7d50.tar.bz2 rneovim-86706011a67efb3e248691bf2391355d0e0e7d50.zip | |
vim-patch:7.4.1590
Problem: Warning for shadowed variable. (Christian Brabandt)
Solution: Move the variable into a local block.
https://github.com/vim/vim/commit/3f242a844e83a5a04943869f6e3bcbf8650dc465
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 38ddd55855..1cd52832ee 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -18313,7 +18313,6 @@ handle_subscript ( char_u *s; int len; typval_T functv; - partial_T *pt = NULL; while (ret == OK && (**arg == '[' @@ -18322,7 +18321,8 @@ handle_subscript ( || rettv->v_type == VAR_PARTIAL))) && !ascii_iswhite(*(*arg - 1))) { if (**arg == '(') { - /* need to copy the funcref so that we can clear rettv */ + partial_T *pt = NULL; + // need to copy the funcref so that we can clear rettv if (evaluate) { functv = *rettv; rettv->v_type = VAR_UNKNOWN; diff --git a/src/nvim/version.c b/src/nvim/version.c index 24fe2ecd9e..fe03b6915b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -852,7 +852,7 @@ static int included_patches[] = { // 1593 NA 1592, 1591, - // 1590, + 1590, 1589, 1588, // 1587 NA |