aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval/funcs.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 0d2653ef21..c125bd8893 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -548,8 +548,7 @@ static void f_byte2line(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
/// "call(func, arglist [, dict])" function
static void f_call(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
- if (argvars[1].v_type != VAR_LIST) {
- emsg(_(e_listreq));
+ if (tv_check_for_list_arg(argvars, 1) == FAIL) {
return;
}
if (argvars[1].vval.v_list == NULL) {
@@ -575,13 +574,16 @@ 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;
+ char *tofree = NULL;
+ if (argvars[0].v_type == VAR_STRING) {
+ char *p = func;
+ 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;
}
- func = tofree;
dict_T *selfdict = NULL;
if (argvars[2].v_type != VAR_UNKNOWN) {