aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunMing Xie <qqzz014@gmail.com>2017-11-20 09:02:15 +0800
committerJustin M. Keyes <justinkz@gmail.com>2017-11-20 02:02:15 +0100
commit7d24a95b450c0d97706e2d92a19424d84d51015e (patch)
tree736df5beb165fc990c78733a0469707aaf33b933
parentdf107149913f82e8b3b6b2060d6dbed3d90e68fe (diff)
downloadrneovim-7d24a95b450c0d97706e2d92a19424d84d51015e.tar.gz
rneovim-7d24a95b450c0d97706e2d92a19424d84d51015e.tar.bz2
rneovim-7d24a95b450c0d97706e2d92a19424d84d51015e.zip
vim-patch:8.0.0287 (#7590)
Problem: Cannot access the arguments of the current function in debug mode. (Luc Hermitte) Solution: use get_funccal(). (Lemonboy, closes vim/vim#1432, closes vim/vim#1352) https://github.com/vim/vim/commit/c7d9eacefa319e5ac3b3b2334fda5acb126b8716
-rw-r--r--src/nvim/eval.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 33bea8ef87..3c58f81d4b 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -18732,7 +18732,7 @@ static dictitem_T *find_var_in_ht(hashtab_T *const ht,
case 'l': return (current_funccal == NULL
? NULL : (dictitem_T *)&current_funccal->l_vars_var);
case 'a': return (current_funccal == NULL
- ? NULL : (dictitem_T *)&current_funccal->l_avars_var);
+ ? NULL : (dictitem_T *)&get_funccal()->l_avars_var);
}
return NULL;
}
diff --git a/src/nvim/version.c b/src/nvim/version.c
index c73cc0d3ee..997db1726b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -817,7 +817,7 @@ static const int included_patches[] = {
290,
// 289,
// 288 NA
- // 287,
+ 287,
// 286,
// 285 NA
// 284 NA