aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2024-02-18 18:04:28 +0100
committerGitHub <noreply@github.com>2024-02-18 18:04:28 +0100
commit93c911e52feadff72003f7e78257c00c3bbf1570 (patch)
treeff0e65d868b9e30ec4759f13e3c3809f8fd41697 /src/nvim/eval
parentd94adff48b1882f9078b0ae94b677be5d29e5fd2 (diff)
parent97531be1f766e6cad79e6360ae9cb827434cff3c (diff)
downloadrneovim-93c911e52feadff72003f7e78257c00c3bbf1570.tar.gz
rneovim-93c911e52feadff72003f7e78257c00c3bbf1570.tar.bz2
rneovim-93c911e52feadff72003f7e78257c00c3bbf1570.zip
Merge pull request #27511 from bfredl/maparena
refactor(api): use arena for mappings, autocmd, channel info
Diffstat (limited to 'src/nvim/eval')
-rw-r--r--src/nvim/eval/funcs.c2
-rw-r--r--src/nvim/eval/typval.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 8dbff8a7a6..e5af50c8f8 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -374,7 +374,7 @@ static void api_wrapper(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
goto end;
}
- object_to_vim(result, rettv, &err);
+ object_to_vim_take_luaref(&result, rettv, true, &err);
end:
if (!handler.arena_return) {
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index fb9e7ff9a8..9328f53dbd 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1805,10 +1805,10 @@ void callback_copy(Callback *dest, Callback *src)
}
/// Generate a string description of a callback
-char *callback_to_string(Callback *cb)
+char *callback_to_string(Callback *cb, Arena *arena)
{
if (cb->type == kCallbackLua) {
- return nlua_funcref_str(cb->data.luaref);
+ return nlua_funcref_str(cb->data.luaref, arena);
}
const size_t msglen = 100;