IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1590

Browse Source 
Problem:    Warning for shadowed variable. (Christian Brabandt)
Solution:   Move the variable into a local block.

3f242a844e
This commit is contained in:
Michael Ennen 2016-10-27 13:51:04 -07:00 committed by James McCoy
parent 531249a4ac
commit 86706011a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval.c
View File

@ -18313,7 +18313,6 @@ handle_subscript (
char_u *s; char_u *s;
int len; int len;
typval_T functv; typval_T functv;
partial_T *pt = NULL;
while (ret == OK while (ret == OK
&& (**arg == '[' && (**arg == '['
@ -18322,7 +18321,8 @@ handle_subscript (
|| rettv->v_type == VAR_PARTIAL))) || rettv->v_type == VAR_PARTIAL)))
&& !ascii_iswhite(*(*arg - 1))) { && !ascii_iswhite(*(*arg - 1))) {
if (**arg == '(') { 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) { if (evaluate) {
functv = *rettv; functv = *rettv;
rettv->v_type = VAR_UNKNOWN; rettv->v_type = VAR_UNKNOWN;

2
src/nvim/version.c
View File

@ -852,7 +852,7 @@ static int included_patches[] = {
// 1593 NA // 1593 NA
1592, 1592,
1591, 1591,
// 1590, 1590,
1589, 1589,
1588, 1588,
// 1587 NA // 1587 NA