diff options
author | zeertzjq <zeertzjq@outlook.com> | 2025-01-16 09:27:08 +0800 |
---|---|---|
committer | zeertzjq <zeertzjq@outlook.com> | 2025-01-16 11:17:14 +0800 |
commit | f8680d009741d01e137aeb2232aa7e033cd70d7b (patch) | |
tree | 38a864a0005e055eb4f4a40809b0dda85d83cecc /src/nvim/eval/funcs.c | |
parent | 718e16536052c0e75de61a32ef237a9e87fc03f2 (diff) | |
download | rneovim-f8680d009741d01e137aeb2232aa7e033cd70d7b.tar.gz rneovim-f8680d009741d01e137aeb2232aa7e033cd70d7b.tar.bz2 rneovim-f8680d009741d01e137aeb2232aa7e033cd70d7b.zip |
vim-patch:9.1.1013: Vim9: Regression caused by patch v9.1.0646
Problem: Vim9: Regression caused by patch v9.1.0646
Solution: Translate the function name before invoking it in call()
(Yegappan Lakshmanan)
fixes: vim/vim#16430
closes: vim/vim#16445
https://github.com/vim/vim/commit/6289f9159102e0855bedc566636b5e7ca6ced72c
N/A patch:
vim-patch:8.2.4176: Vim9: cannot use imported function with call()
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r-- | src/nvim/eval/funcs.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index ed3efca0d7..0d2653ef21 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -575,22 +575,29 @@ static void f_call(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) if (func == NULL || *func == NUL) { return; // type error, empty name or null function } + char *p = func; + char *tofree = trans_function_name(&p, false, TFN_INT|TFN_QUIET, NULL, NULL); + if (tofree == NULL) { + emsg_funcname(e_unknown_function_str, func); + return; + } + func = tofree; dict_T *selfdict = NULL; if (argvars[2].v_type != VAR_UNKNOWN) { if (tv_check_for_dict_arg(argvars, 2) == FAIL) { - if (owned) { - func_unref(func); - } - return; + goto done; } selfdict = argvars[2].vval.v_dict; } func_call(func, &argvars[1], partial, selfdict, rettv); + +done: if (owned) { func_unref(func); } + xfree(tofree); } /// "changenr()" function |