aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.2.1397: Vim9: return type of maparg() not adjusted for fourth arg

Browse Source 
Problem:    Vim9: return type of maparg() not adjusted for fourth argument.
Solution:   Check if fourth argument is present. (closes #6645)
This commit is contained in:
Bram Moolenaar
2020-08-08 17:55:49 +02:00
parent 5a849da57c
commit 4a6d1b660f
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/evalfunc.c
View File

@@ -402,6 +402,15 @@ ret_getreg(int argcount, type_T **argtypes UNUSED)
return &t_string;
}
static type_T *
ret_maparg(int argcount, type_T **argtypes UNUSED)
{
// Assume that if the fourth argument is passed it's non-zero
if (argcount == 4)
return &t_dict_any;
return &t_string;
}
static type_T *ret_f_function(int argcount, type_T **argtypes);
/*
@@ -729,7 +738,7 @@ static funcentry_T global_functions[] =
#endif
},
{"map", 2, 2, FEARG_1, ret_any, f_map},
{"maparg", 1, 4, FEARG_1, ret_string, f_maparg},
{"maparg", 1, 4, FEARG_1, ret_maparg, f_maparg},
{"mapcheck", 1, 3, FEARG_1, ret_string, f_mapcheck},
{"mapset", 3, 3, FEARG_1, ret_void, f_mapset},
{"match", 2, 4, FEARG_1, ret_any, f_match},