aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.0345: error message for list argument could be clearer

Browse Source 
Problem:    Error message for list argument could be clearer.
Solution:   Include the argument number. (Yegappan Lakshmanan, closes #11027)
This commit is contained in:
Bram Moolenaar
2022-09-01 12:22:46 +01:00
parent e42c8dae32
commit d83392a43a
22 changed files with 63 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/filepath.c
View File

@@ -1603,19 +1603,20 @@ readdir_checkitem(void *context, void *item)
return checkitem_common(context, name, NULL);
}
/*
* Process the keys in the Dict argument to the readdir() and readdirex()
* functions. Assumes the Dict argument is the 3rd argument.
*/
static int
readdirex_dict_arg(typval_T *tv, int *cmp)
readdirex_dict_arg(typval_T *argvars, int *cmp)
{
char_u *compare;
if (tv->v_type != VAR_DICT)
{
emsg(_(e_dictionary_required));
if (check_for_nonnull_dict_arg(argvars, 2) == FAIL)
return FAIL;
}
if (dict_has_key(tv->vval.v_dict, "sort"))
compare = dict_get_string(tv->vval.v_dict, "sort", FALSE);
if (dict_has_key(argvars[2].vval.v_dict, "sort"))
compare = dict_get_string(argvars[2].vval.v_dict, "sort", FALSE);
else
{
semsg(_(e_dictionary_key_str_required), "sort");
@@ -1660,7 +1661,7 @@ f_readdir(typval_T *argvars, typval_T *rettv)
expr = &argvars[1];
if (argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN &&
readdirex_dict_arg(&argvars[2], &sort) == FAIL)
readdirex_dict_arg(argvars, &sort) == FAIL)
return;
ret = readdir_core(&ga, path, FALSE, (void *)expr,
@@ -1713,7 +1714,7 @@ f_readdirex(typval_T *argvars, typval_T *rettv)
expr = &argvars[1];
if (argvars[1].v_type != VAR_UNKNOWN && argvars[2].v_type != VAR_UNKNOWN &&
readdirex_dict_arg(&argvars[2], &sort) == FAIL)
readdirex_dict_arg(argvars, &sort) == FAIL)
return;
ret = readdir_core(&ga, path, TRUE, (void *)expr,