aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.1133: error message names do not match the items

Browse Source 
Problem:    Error message names do not match the items.
Solution:   Add "_str" when the text contains "%s".
This commit is contained in:
Bram Moolenaar
2023-01-02 18:10:04 +00:00
parent dc4daa3a39
commit a9fa8c58fb
16 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vim9execute.c
View File

@@ -229,12 +229,11 @@ exe_newdict(int count, ectx_T *ectx)
// have already checked key type is VAR_STRING
tv = STACK_TV_BOT(2 * (idx - count));
// check key is unique
key = tv->vval.v_string == NULL
? (char_u *)"" : tv->vval.v_string;
key = tv->vval.v_string == NULL ? (char_u *)"" : tv->vval.v_string;
item = dict_find(dict, key, -1);
if (item != NULL)
{
semsg(_(e_duplicate_key_in_dictionary), key);
semsg(_(e_duplicate_key_in_dictionary_str), key);
dict_unref(dict);
return MAYBE;
}
@@ -2386,8 +2385,7 @@ execute_unletindex(isn_T *iptr, ectx_T *ectx)
if (di == NULL)
{
// NULL dict is equivalent to empty dict
semsg(_(e_key_not_present_in_dictionary),
key);
semsg(_(e_key_not_present_in_dictionary_str), key);
status = FAIL;
}
else if (var_check_fixed(di->di_flags,
@@ -5103,7 +5101,7 @@ exec_instructions(ectx_T *ectx)
if ((di = dict_find(dict, key, -1)) == NULL)
{
SOURCING_LNUM = iptr->isn_lnum;
semsg(_(e_key_not_present_in_dictionary), key);
semsg(_(e_key_not_present_in_dictionary_str), key);
// If :silent! is used we will continue, make sure the
// stack contents makes sense and the dict stack is
@@ -5146,7 +5144,7 @@ exec_instructions(ectx_T *ectx)
== NULL)
{
SOURCING_LNUM = iptr->isn_lnum;
semsg(_(e_key_not_present_in_dictionary),
semsg(_(e_key_not_present_in_dictionary_str),
iptr->isn_arg.string);
goto on_error;
}