summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-01 14:19:49 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-01 14:19:49 +0000
commit460ae5dfca31fa627531c263184849976755cf6b (patch)
treed94de6a24285bc10fd62ad4ae9aecb53f9a7e913
parentb37a65e4bf08c4eec4fa5b81a5efc3945fca44de (diff)
patch 8.2.3967: error messages are spread outv8.2.3967
Problem: Error messages are spread out. Solution: Move more errors to errors.h.
-rw-r--r--src/arglist.c4
-rw-r--r--src/autocmd.c6
-rw-r--r--src/blob.c14
-rw-r--r--src/bufwrite.c2
-rw-r--r--src/channel.c2
-rw-r--r--src/cmdexpand.c4
-rw-r--r--src/dict.c6
-rw-r--r--src/diff.c2
-rw-r--r--src/errors.h131
-rw-r--r--src/eval.c18
-rw-r--r--src/evalfunc.c22
-rw-r--r--src/evalvars.c20
-rw-r--r--src/ex_cmds.c8
-rw-r--r--src/ex_docmd.c13
-rw-r--r--src/feature.h12
-rw-r--r--src/fileio.c4
-rw-r--r--src/filepath.c10
-rw-r--r--src/getchar.c2
-rw-r--r--src/globals.h74
-rw-r--r--src/gui_gtk_x11.c4
-rw-r--r--src/gui_x11.c2
-rw-r--r--src/hardcopy.c2
-rw-r--r--src/help.c2
-rw-r--r--src/highlight.c6
-rw-r--r--src/if_cscope.c2
-rw-r--r--src/if_lua.c4
-rw-r--r--src/if_mzsch.c8
-rw-r--r--src/if_perl.xs2
-rw-r--r--src/if_python.c6
-rw-r--r--src/if_python3.c6
-rw-r--r--src/if_ruby.c4
-rw-r--r--src/if_tcl.c4
-rw-r--r--src/if_xcmdsrv.c2
-rw-r--r--src/indent.c4
-rw-r--r--src/insexpand.c5
-rw-r--r--src/job.c2
-rw-r--r--src/list.c36
-rw-r--r--src/main.c2
-rw-r--r--src/map.c2
-rw-r--r--src/match.c4
-rw-r--r--src/mbyte.c6
-rw-r--r--src/message.c6
-rw-r--r--src/misc1.c12
-rw-r--r--src/option.c44
-rw-r--r--src/optionstr.c2
-rw-r--r--src/os_mswin.c4
-rw-r--r--src/os_unix.c14
-rw-r--r--src/os_win32.c10
-rw-r--r--src/popupwin.c18
-rw-r--r--src/profiler.c2
-rw-r--r--src/quickfix.c20
-rw-r--r--src/scriptfile.c2
-rw-r--r--src/search.c6
-rw-r--r--src/session.c2
-rw-r--r--src/sign.c18
-rw-r--r--src/spell.c2
-rw-r--r--src/spellfile.c16
-rw-r--r--src/spellsuggest.c4
-rw-r--r--src/syntax.c2
-rw-r--r--src/tag.c2
-rw-r--r--src/terminal.c20
-rw-r--r--src/testing.c4
-rw-r--r--src/textprop.c20
-rw-r--r--src/typval.c2
-rw-r--r--src/userfunc.c8
-rw-r--r--src/version.c2
-rw-r--r--src/vim9execute.c20
-rw-r--r--src/vim9expr.c2
-rw-r--r--src/vim9instr.c2
-rw-r--r--src/vim9script.c2
70 files changed, 403 insertions, 334 deletions
diff --git a/src/arglist.c b/src/arglist.c
index 104c67a00f..3ca5e4ccce 100644
--- a/src/arglist.c
+++ b/src/arglist.c
@@ -460,7 +460,7 @@ do_arglist(
vim_regfree(regmatch.regprog);
vim_free(p);
if (!didone)
- semsg(_(e_nomatch2), ((char_u **)new_ga.ga_data)[i]);
+ semsg(_(e_no_match_str_2), ((char_u **)new_ga.ga_data)[i]);
}
ga_clear(&new_ga);
}
@@ -471,7 +471,7 @@ do_arglist(
ga_clear(&new_ga);
if (i == FAIL || exp_count == 0)
{
- emsg(_(e_nomatch));
+ emsg(_(e_no_match));
return FAIL;
}
diff --git a/src/autocmd.c b/src/autocmd.c
index 4831ea80dc..862370fc6e 100644
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -911,7 +911,7 @@ do_autocmd(exarg_T *eap, char_u *arg_in, int forceit)
if (STRNCMP(cmd, "++once", 6) == 0 && VIM_ISWHITE(cmd[6]))
{
if (once)
- semsg(_(e_duparg2), "++once");
+ semsg(_(e_duplicate_argument_str), "++once");
once = TRUE;
cmd = skipwhite(cmd + 6);
}
@@ -920,7 +920,7 @@ do_autocmd(exarg_T *eap, char_u *arg_in, int forceit)
if ((STRNCMP(cmd, "++nested", 8) == 0 && VIM_ISWHITE(cmd[8])))
{
if (nested)
- semsg(_(e_duparg2), "++nested");
+ semsg(_(e_duplicate_argument_str), "++nested");
nested = TRUE;
cmd = skipwhite(cmd + 8);
}
@@ -929,7 +929,7 @@ do_autocmd(exarg_T *eap, char_u *arg_in, int forceit)
if (STRNCMP(cmd, "nested", 6) == 0 && VIM_ISWHITE(cmd[6]))
{
if (nested)
- semsg(_(e_duparg2), "nested");
+ semsg(_(e_duplicate_argument_str), "nested");
nested = TRUE;
cmd = skipwhite(cmd + 6);
}
diff --git a/src/blob.c b/src/blob.c
index 37d2be69b6..b5b4428a81 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -350,7 +350,7 @@ blob_slice_or_index(
}
else
{
- semsg(_(e_blobidx), n1);
+ semsg(_(e_blob_index_out_of_range_nr), n1);
return FAIL;
}
}
@@ -366,7 +366,7 @@ check_blob_index(long bloblen, varnumber_T n1, int quiet)
if (n1 < 0 || n1 > bloblen)
{
if (!quiet)
- semsg(_(e_blobidx), n1);
+ semsg(_(e_blob_index_out_of_range_nr), n1);
return FAIL;
}
return OK;
@@ -381,7 +381,7 @@ check_blob_range(long bloblen, varnumber_T n1, varnumber_T n2, int quiet)
if (n2 < 0 || n2 >= bloblen || n2 < n1)
{
if (!quiet)
- semsg(_(e_blobidx), n2);
+ semsg(_(e_blob_index_out_of_range_nr), n2);
return FAIL;
}
return OK;
@@ -465,7 +465,7 @@ blob_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg)
idx = len + idx;
if (idx < 0 || idx >= len)
{
- semsg(_(e_blobidx), idx);
+ semsg(_(e_blob_index_out_of_range_nr), idx);
return;
}
if (argvars[2].v_type == VAR_UNKNOWN)
@@ -487,7 +487,7 @@ blob_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg)
end = len + end;
if (end >= len || idx > end)
{
- semsg(_(e_blobidx), end);
+ semsg(_(e_blob_index_out_of_range_nr), end);
return;
}
newblob = blob_alloc();
@@ -563,7 +563,7 @@ blob_filter_map(
if (newtv.v_type != VAR_NUMBER && newtv.v_type != VAR_BOOL)
{
clear_tv(&newtv);
- emsg(_(e_invalblob));
+ emsg(_(e_invalid_operation_for_blob));
break;
}
if (filtermap != FILTERMAP_FILTER)
@@ -660,7 +660,7 @@ blob_reduce(
{
if (b == NULL || b->bv_ga.ga_len == 0)
{
- semsg(_(e_reduceempty), "Blob");
+ semsg(_(e_reduce_of_an_empty_str_with_no_initial_value), "Blob");
return;
}
initial.v_type = VAR_NUMBER;
diff --git a/src/bufwrite.c b/src/bufwrite.c
index c0d5de36ce..a7e1ad5eee 100644
--- a/src/bufwrite.c
+++ b/src/bufwrite.c
@@ -2178,7 +2178,7 @@ restore_backup:
// If the 'fsync' option is FALSE, don't fsync(). Useful for laptops.
if (p_fs && vim_fsync(fd) != 0 && !device)
{
- errmsg = (char_u *)_(e_fsync);
+ errmsg = (char_u *)_(e_fsync_failed);
end = 0;
}
#endif
diff --git a/src/channel.c b/src/channel.c
index 5133440173..ec91739709 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -161,7 +161,7 @@ ch_logfile(char_u *fname, char_u *opt)
file = fopen((char *)fname, *opt == 'w' ? "w" : "a");
if (file == NULL)
{
- semsg(_(e_notopen), fname);
+ semsg(_(e_cant_open_file_str), fname);
return;
}
vim_free(log_name);
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 9468beba75..e496bc3675 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -366,13 +366,13 @@ ExpandOne(
// are wildcards, the real problem is that there was no match,
// causing the pattern to be added, which has illegal characters.
if (!(options & WILD_SILENT) && (options & WILD_LIST_NOTFOUND))
- semsg(_(e_nomatch2), str);
+ semsg(_(e_no_match_str_2), str);
#endif
}
else if (xp->xp_numfiles == 0)
{
if (!(options & WILD_SILENT))
- semsg(_(e_nomatch2), str);
+ semsg(_(e_no_match_str_2), str);
}
else
{
diff --git a/src/dict.c b/src/dict.c
index 6773c757d9..0c9cea38b6 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -1414,7 +1414,7 @@ dict_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg)
di = dict_find(d, key, -1);
if (di == NULL)
{
- semsg(_(e_dictkey), key);
+ semsg(_(e_key_not_present_in_dictionary), key);
return;
}
@@ -1449,7 +1449,7 @@ dict_list(typval_T *argvars, typval_T *rettv, int what)
if (argvars[0].v_type != VAR_DICT)
{
- emsg(_(e_dictreq));
+ emsg(_(e_dictionary_required));
return;
}
@@ -1572,7 +1572,7 @@ f_has_key(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type != VAR_DICT)
{
- emsg(_(e_dictreq));
+ emsg(_(e_dictionary_required));
return;
}
if (argvars[0].vval.v_dict == NULL)
diff --git a/src/diff.c b/src/diff.c
index a3bb9c405f..59b7891b92 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1319,7 +1319,7 @@ ex_diffpatch(exarg_T *eap)
if (dirbuf[0] != NUL)
{
if (mch_chdir((char *)dirbuf) != 0)
- emsg(_(e_prev_dir));
+ emsg(_(e_cannot_go_back_to_previous_directory));
shorten_fnames(TRUE);
}
#endif
diff --git a/src/errors.h b/src/errors.h
index 7301b4a009..82b96b8a3f 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -329,7 +329,7 @@ EXTERN char e_sorry_no_help_for_str[]
INIT(= N_("E149: Sorry, no help for %s"));
EXTERN char e_not_a_directory_str[]
INIT(= N_("E150: Not a directory: %s"));
-EXTERN char e_no_match_str[]
+EXTERN char e_no_match_str_1[]
INIT(= N_("E151: No match: %s"));
EXTERN char e_cannot_open_str_for_writing_1[]
INIT(= N_("E152: Cannot open %s for writing"));
@@ -497,6 +497,10 @@ EXTERN char e_makemap_illegal_mode[]
EXTERN char e_cannot_start_the_GUI[]
INIT(= N_("E229: Cannot start the GUI"));
+#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
+EXTERN char e_cannot_open_display[]
+ INIT(= N_("E233: cannot open display"));
+#endif
#if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
EXTERN char e_unknown_fontset_str[]
INIT(= N_("E234: Unknown fontset: %s"));
@@ -510,6 +514,10 @@ EXTERN char e_unknown_font_str[]
EXTERN char e_font_str_is_not_fixed_width[]
INIT(= N_("E236: Font \"%s\" is not fixed-width"));
#endif
+#ifdef FEAT_CLIENTSERVER
+EXTERN char e_no_registered_server_named_str[]
+ INIT(= N_("E247: no registered server named \"%s\""));
+#endif
EXTERN char e_window_layout_changed_unexpectedly[]
INIT(= N_("E249: window layout changed unexpectedly"));
#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
@@ -521,11 +529,31 @@ EXTERN char e_internal_error_lalloc_zero[]
INIT(= N_("E341: Internal error: lalloc(0, )"));
EXTERN char e_out_of_memory_allocating_nr_bytes[]
INIT(= N_("E342: Out of memory! (allocating %lu bytes)"));
+#ifdef FEAT_LIBCALL
+EXTERN char e_library_call_failed_for_str[]
+ INIT(= N_("E364: Library call failed for \"%s()\""));
+#endif
EXTERN char e_no_such_group_str[]
INIT(= N_("E367: No such group: \"%s\""));
+#ifdef USING_LOAD_LIBRARY
+EXTERN char e_could_not_load_library_str_str[]
+ INIT(= N_("E370: Could not load library %s: %s"));
+#endif
EXTERN char e_cannot_write_buftype_option_is_set[]
INIT(= N_("E382: Cannot write, 'buftype' option is set"));
+#ifdef USING_LOAD_LIBRARY
+EXTERN char e_could_not_load_library_function_str[]
+ INIT(= N_("E448: Could not load library function %s"));
+#endif
+#if defined(UNIX) || defined(FEAT_SESSION)
+EXTERN char e_cannot_go_back_to_previous_directory[]
+ INIT(= N_("E459: Cannot go back to previous directory"));
+#endif
+#ifdef FEAT_EVAL
+EXTERN char e_illegal_variable_name_str[]
+ INIT(= N_("E461: Illegal variable name: %s"));
+#endif
EXTERN char e_ambiguous_use_of_user_defined_command[]
INIT(= N_("E464: Ambiguous use of user-defined command"));
EXTERN char e_command_aborted[]
@@ -546,10 +574,32 @@ EXTERN char e_invalid_value_for_argument_str_str[]
INIT(= N_("E475: Invalid value for argument %s: %s"));
EXTERN char e_invalid_command[]
INIT(= N_("E476: Invalid command"));
+EXTERN char e_no_bang_allowed[]
+ INIT(= N_("E477: No ! allowed"));
#ifdef FEAT_EVAL
EXTERN char e_invalid_command_str[]
INIT(= N_("E476: Invalid command: %s"));
#endif
+EXTERN char e_cant_create_file_str[]
+ INIT(= N_("E482: Can't create file %s"));
+EXTERN char e_cant_get_temp_file_name[]
+ INIT(= N_("E483: Can't get temp file name"));
+EXTERN char e_cant_open_file_str[]
+ INIT(= N_("E484: Can't open file %s"));
+EXTERN char e_cant_read_file_str[]
+ INIT(= N_("E485: Can't read file %s"));
+EXTERN char e_pattern_not_found[]
+ INIT(= N_("E486: Pattern not found"));
+EXTERN char e_pattern_not_found_str[]
+ INIT(= N_("E486: Pattern not found: %s"));
+EXTERN char e_argument_must_be_positive[]
+ INIT(= N_("E487: Argument must be positive"));
+EXTERN char e_no_match[]
+ INIT(= N_("E479: No match"));
+EXTERN char e_no_match_str_2[]
+ INIT(= N_("E480: No match: %s"));
+EXTERN char e_no_range_allowed[]
+ INIT(= N_("E481: No range allowed"));
// E502
EXTERN char e_is_a_directory[]
@@ -615,20 +665,44 @@ EXTERN char e_netbeans_disallows_writes_of_unmodified_buffers[]
EXTERN char e_partial_writes_disallowed_for_netbeans_buffers[]
INIT(= N_("Partial writes disallowed for NetBeans buffers"));
#endif
+#ifdef HAVE_FSYNC
+EXTERN char e_fsync_failed[]
+ INIT(= N_("E667: Fsync failed"));
+#endif
EXTERN char e_no_matching_autocommands_for_acwrite_buffer[]
INIT(= N_("E676: No matching autocommands for acwrite buffer"));
EXTERN char e_buffer_nr_invalid_buffer_number[]
INIT(= N_("E680: <buffer=%d>: invalid buffer number"));
#ifdef FEAT_EVAL
+EXTERN char e_list_index_out_of_range_nr[]
+ INIT(= N_("E684: list index out of range: %ld"));
+#endif
+EXTERN char e_internal_error_str[]
+ INIT(= N_("E685: Internal error: %s"));
+#ifdef FEAT_EVAL
EXTERN char e_cannot_index_a_funcref[]
INIT(= N_("E695: Cannot index a Funcref"));
+EXTERN char e_missing_end_of_list_rsb_str[]
+ INIT(= N_("E697: Missing end of List ']': %s"));
EXTERN char e_list_value_has_more_items_than_targets[]
INIT(= N_("E710: List value has more items than targets"));
EXTERN char e_list_value_does_not_have_enough_items[]
INIT(= N_("E711: List value does not have enough items"));
+EXTERN char e_argument_of_str_must_be_list_or_dictionary[]
+ INIT(= N_("E712: Argument of %s must be a List or Dictionary"));
+EXTERN char e_cannot_use_empty_key_for_dictionary[]
+ INIT(= N_("E713: Cannot use empty key for Dictionary"));
+EXTERN char e_list_required[]
+ INIT(= N_("E714: List required"));
+EXTERN char e_dictionary_required[]
+ INIT(= N_("E715: Dictionary required"));
+EXTERN char e_key_not_present_in_dictionary[]
+ INIT(= N_("E716: Key not present in Dictionary: \"%s\""));
EXTERN char e_cannot_slice_dictionary[]
INIT(= N_("E719: Cannot slice a Dictionary"));
+EXTERN char e_wrong_variable_type_for_str_equal[]
+ INIT(= N_("E734: Wrong variable type for %s="));
EXTERN char e_value_is_locked[]
INIT(= N_("E741: Value is locked"));
EXTERN char e_value_is_locked_str[]
@@ -637,6 +711,16 @@ EXTERN char e_cannot_change_value[]
INIT(= N_("E742: Cannot change value"));
EXTERN char e_cannot_change_value_of_str[]
INIT(= N_("E742: Cannot change value of %s"));
+#endif
+#ifdef FEAT_SPELL
+EXTERN char e_spell_checking_is_not_possible[]
+ INIT(= N_("E756: Spell checking is not possible"));
+#endif
+#ifdef FEAT_QUICKFIX
+EXTERN char e_no_location_list[]
+ INIT(= N_("E776: No location list"));
+#endif
+#ifdef FEAT_EVAL
EXTERN char e_cannot_set_variable_in_sandbox[]
INIT(= N_("E794: Cannot set variable in the sandbox"));
EXTERN char e_cannot_set_variable_in_sandbox_str[]
@@ -650,6 +734,14 @@ EXTERN char e_cannot_delete_variable_str[]
INIT(= N_("E795: Cannot delete variable %s"));
#endif
+#ifndef FEAT_ARABIC
+EXTERN char e_arabic_cannot_be_used_not_enabled_at_compile_time[]
+ INIT(= N_("E800: Arabic cannot be used: Not enabled at compile time\n"));
+#endif
+#ifdef FEAT_EVAL
+EXTERN char e_cannot_use_percent_with_float[]
+ INIT(= N_("E804: Cannot use '%' with Float"));
+#endif
EXTERN char e_blowfish_big_little_endian_use_wrong[]
INIT(= N_("E817: Blowfish big/little endian use wrong"));
EXTERN char e_sha256_test_failed[]
@@ -664,19 +756,40 @@ EXTERN char e_conflicts_with_value_of_listchars[]
INIT(= N_("E834: Conflicts with value of 'listchars'"));
EXTERN char e_conflicts_with_value_of_fillchars[]
INIT(= N_("E835: Conflicts with value of 'fillchars'"));
+// E839 unused
EXTERN char e_autocommands_caused_command_to_abort[]
INIT(= N_("E855: Autocommands caused command to abort"));
#ifdef FEAT_EVAL
EXTERN char e_assert_fails_second_arg[]
INIT(= N_("E856: \"assert_fails()\" second argument must be a string or a list with one or two strings"));
+EXTERN char e_dictionary_key_str_required[]
+ INIT(= N_("E857: Dictionary key \"%s\" required"));
+#endif
+#ifdef FEAT_PROP_POPUP
+EXTERN char e_number_required[]
+ INIT(= N_("E889: Number required"));
+#endif
+#ifdef FEAT_EVAL
+EXTERN char e_argument_of_str_must_be_list_dictionary_or_blob[]
+ INIT(= N_("E896: Argument of %s must be a List, Dictionary or Blob"));
+EXTERN char e_list_or_blob_required[]
+ INIT(= N_("E897: List or Blob required"));
+#endif
+#ifdef FEAT_EVAL
EXTERN char e_using_invalid_value_as_string_str[]
INIT(= N_("E908: using an invalid value as a String: %s"));
EXTERN char e_cannot_index_special_variable[]
INIT(= N_("E909: Cannot index a special variable"));
+EXTERN char e_string_required[]
+ INIT(= N_("E928: String required"));
#endif
EXTERN char e_buffer_cannot_be_registered[]
INIT(= N_("E931: Buffer cannot be registered"));
+#ifdef FEAT_EVAL
+EXTERN char e_function_was_deleted_str[]
+ INIT(= N_("E933: Function was deleted: %s"));
+#endif
EXTERN char e_cannot_delete_current_group[]
INIT(= N_("E936: Cannot delete the current group"));
EXTERN char e_attempt_to_delete_buffer_that_is_in_use_str[]
@@ -695,6 +808,22 @@ EXTERN char_u e_invalid_line_number_nr[]
INIT(= N_("E966: Invalid line number: %ld"));
EXTERN char e_blob_value_does_not_have_right_number_of_bytes[]
INIT(= N_("E972: Blob value does not have the right number of bytes"));
+#ifdef FEAT_EVAL
+EXTERN char e_invalid_operation_for_blob[]
+ INIT(= N_("E978: Invalid operation for Blob"));
+EXTERN char e_blob_index_out_of_range_nr[]
+ INIT(= N_("E979: Blob index out of range: %ld"));
+#endif
+EXTERN char e_duplicate_argument_str[]
+ INIT(= N_("E983: Duplicate argument: %s"));
+#ifdef FEAT_EVAL
+EXTERN char e_cannot_modify_existing_variable[]
+ INIT(= N_("E995: Cannot modify existing variable"));
+EXTERN char e_cannot_lock_an_option[]
+ INIT(= N_("E996: Cannot lock an option"));
+EXTERN char e_reduce_of_an_empty_str_with_no_initial_value[]
+ INIT(= N_("E998: Reduce of an empty %s with no initial value"));
+#endif
EXTERN char e_command_not_supported_in_vim9_script_missing_var_str[]
INIT(= N_("E1100: Command not supported in Vim9 script (missing :var?): %s"));
diff --git a/src/eval.c b/src/eval.c
index 0c5967b6c3..6094b60ad2 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -997,7 +997,7 @@ get_lval(
if (len == 0)
{
if (!quiet)
- emsg(_(e_emptykey));
+ emsg(_(e_cannot_use_empty_key_for_dictionary));
return NULL;
}
p = key + len;
@@ -1148,7 +1148,7 @@ get_lval(
if (lp->ll_dict == get_vimvar_dict()
|| &lp->ll_dict->dv_hashtab == get_funccal_args_ht())
{
- semsg(_(e_illvar), name);
+ semsg(_(e_illegal_variable_name_str), name);
clear_tv(&var1);
return NULL;
}
@@ -1157,7 +1157,7 @@ get_lval(
if (*p == '[' || *p == '.' || unlet)
{
if (!quiet)
- semsg(_(e_dictkey), key);
+ semsg(_(e_key_not_present_in_dictionary), key);
clear_tv(&var1);
return NULL;
}
@@ -1306,7 +1306,7 @@ set_var_lval(
if (op != NULL && *op != '=')
{
- semsg(_(e_letwrong), op);
+ semsg(_(e_wrong_variable_type_for_str_equal), op);
return;
}
if (value_check_lock(lp->ll_blob->bv_lock, lp->ll_name, FALSE))
@@ -1335,7 +1335,7 @@ set_var_lval(
if ((flags & (ASSIGN_CONST | ASSIGN_FINAL))
&& (flags & ASSIGN_FOR_LOOP) == 0)
{
- emsg(_(e_cannot_mod));
+ emsg(_(e_cannot_modify_existing_variable));
*endp = cc;
return;
}
@@ -1401,7 +1401,7 @@ set_var_lval(
{
if (op != NULL && *op != '=')
{
- semsg(_(e_dictkey), lp->ll_newkey);
+ semsg(_(e_key_not_present_in_dictionary), lp->ll_newkey);
return;
}
if (dict_wrong_func_name(lp->ll_tv->vval.v_dict, rettv,
@@ -1590,7 +1590,7 @@ tv_op(typval_T *tv1, typval_T *tv2, char_u *op)
}
}
- semsg(_(e_letwrong), op);
+ semsg(_(e_wrong_variable_type_for_str_equal), op);
return FAIL;
}
@@ -3248,7 +3248,7 @@ eval6(
}
else
{
- emsg(_(e_modulus));
+ emsg(_(e_cannot_use_percent_with_float));
return FAIL;
}
rettv->v_type = VAR_FLOAT;
@@ -4325,7 +4325,7 @@ eval_index_inner(
{
if (keylen > 0)
key[keylen] = NUL;
- semsg(_(e_dictkey), key);
+ semsg(_(e_key_not_present_in_dictionary), key);
}
return FAIL;
}
diff --git a/src/evalfunc.c b/src/evalfunc.c
index d61797ae31..e5a0a4504e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2935,7 +2935,7 @@ f_call(typval_T *argvars, typval_T *rettv)
if (argvars[1].v_type != VAR_LIST)
{
- emsg(_(e_listreq));
+ emsg(_(e_list_required));
return;
}
if (argvars[1].vval.v_list == NULL)
@@ -2957,7 +2957,7 @@ f_call(typval_T *argvars, typval_T *rettv)
{</