From 7d24a95b450c0d97706e2d92a19424d84d51015e Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Mon, 20 Nov 2017 09:02:15 +0800
Subject: 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
---
 src/nvim/eval.c    | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit