Skip to content

Commit 108010a

Browse files
brammoolbrammool
committed
patch 8.2.3069: error messages are spread out
Problem: Error messages are spread out. Solution: Move some error messages to errors.h. Use clearer names.
1 parent d887297 commit 108010a

32 files changed

Lines changed: 130 additions & 109 deletions

‎src/arglist.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ ex_argdelete(exarg_T *eap)
832832
{
833833
// Don't give an error for ":%argdel" if the list is empty.
834834
if (eap->line1 != 1 || eap->line2 != 0)
835-
emsg(_(e_invrange));
835+
emsg(_(e_invalid_range));
836836
}
837837
else
838838
{
@@ -920,7 +920,7 @@ do_arg_all(
920920
#ifdef FEAT_CMDWIN
921921
if (cmdwin_type != 0)
922922
{
923-
emsg(_(e_cmdwin));
923+
emsg(_(e_invalid_in_cmdline_window));
924924
return;
925925
}
926926
#endif

‎src/buffer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2407,7 +2407,7 @@ buflist_getfile(
24072407
if (buf == NULL)
24082408
{
24092409
if ((options & GETF_ALT) && n == 0)
2410-
emsg(_(e_noalt));
2410+
emsg(_(e_no_alternate_file));
24112411
else
24122412
semsg(_("E92: Buffer %d not found"), n);
24132413
return FAIL;
@@ -3516,7 +3516,7 @@ getaltfname(
35163516
if (buflist_name_nr(0, &fname, &dummy) == FAIL)
35173517
{
35183518
if (errmsg)
3519-
emsg(_(e_noalt));
3519+
emsg(_(e_no_alternate_file));
35203520
return NULL;
35213521
}
35223522
return fname;

‎src/channel.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,7 @@ channel_set_options(channel_T *channel, jobopt_T *opt)
12321232

12331233
if (!buf->b_p_ma && !channel->ch_part[PART_OUT].ch_nomodifiable)
12341234
{
1235-
emsg(_(e_modifiable));
1235+
emsg(_(e_cannot_make_changes_modifiable_is_off));
12361236
}
12371237
else
12381238
{
@@ -1278,7 +1278,7 @@ channel_set_options(channel_T *channel, jobopt_T *opt)
12781278
!opt->jo_modifiable[PART_ERR];
12791279
if (!buf->b_p_ma && !channel->ch_part[PART_ERR].ch_nomodifiable)
12801280
{
1281-
emsg(_(e_modifiable));
1281+
emsg(_(e_cannot_make_changes_modifiable_is_off));
12821282
}
12831283
else
12841284
{

‎src/errors.h‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,44 @@
1010
* Definition of error messages, sorted on error number.
1111
*/
1212

13+
EXTERN char e_backslash_should_be_followed_by[]
14+
INIT(= N_("E10: \\ should be followed by /, ? or &"));
15+
#ifdef FEAT_CMDWIN
16+
EXTERN char e_invalid_in_cmdline_window[]
17+
INIT(= N_("E11: Invalid in command-line window; <CR> executes, CTRL-C quits"));
18+
#endif
19+
EXTERN char e_command_not_allowed_from_vimrc_in_current_dir_or_tag_search[]
20+
INIT(= N_("E12: Command not allowed from exrc/vimrc in current dir or tag search"));
21+
EXTERN char e_file_exists[]
22+
INIT(= N_("E13: File exists (add ! to override)"));
23+
#ifdef FEAT_EVAL
24+
EXTERN char e_invalid_expression_str[]
25+
INIT(= N_("E15: Invalid expression: \"%s\""));
26+
#endif
27+
EXTERN char e_invalid_range[]
28+
INIT(= N_("E16: Invalid range"));
29+
#if defined(UNIX) || defined(FEAT_SYN_HL) || defined(FEAT_SPELL)
30+
EXTERN char e_src_is_directory[]
31+
INIT(= N_("E17: \"%s\" is a directory"));
32+
#endif
33+
#ifdef FEAT_EVAL
34+
EXTERN char e_unexpected_characters_in_let[]
35+
INIT(= N_("E18: Unexpected characters in :let"));
36+
EXTERN char e_unexpected_characters_in_assignment[]
37+
INIT(= N_("E18: Unexpected characters in assignment"));
38+
#endif
39+
EXTERN char e_mark_has_invalid_line_number[]
40+
INIT(= N_("E19: Mark has invalid line number"));
41+
EXTERN char e_mark_not_set[]
42+
INIT(= N_("E20: Mark not set"));
43+
EXTERN char e_cannot_make_changes_modifiable_is_off[]
44+
INIT(= N_("E21: Cannot make changes, 'modifiable' is off"));
45+
EXTERN char e_scripts_nested_too_deep[]
46+
INIT(= N_("E22: Scripts nested too deep"));
47+
EXTERN char e_no_alternate_file[]
48+
INIT(= N_("E23: No alternate file"));
49+
EXTERN char e_no_such_abbreviation[]
50+
INIT(= N_("E24: No such abbreviation"));
1351
#ifdef FEAT_EVAL
1452
EXTERN char e_undefined_variable_str[]
1553
INIT(= N_("E121: Undefined variable: %s"));

‎src/eval.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ eval1_emsg(char_u **arg, typval_T *rettv, exarg_T *eap)
216216
// Also check called_emsg for when using assert_fails().
217217
if (!aborting() && did_emsg == did_emsg_before
218218
&& called_emsg == called_emsg_before)
219-
semsg(_(e_invexpr2), start);
219+
semsg(_(e_invalid_expression_str), start);
220220
}
221221
clear_evalarg(&evalarg, eap);
222222
return ret;
@@ -297,7 +297,7 @@ eval_expr_typval(typval_T *expr, typval_T *argv, int argc, typval_T *rettv)
297297
if (*skipwhite(s) != NUL) // check for trailing chars after expr
298298
{
299299
clear_tv(rettv);
300-
semsg(_(e_invexpr2), s);
300+
semsg(_(e_invalid_expression_str), s);
301301
return FAIL;
302302
}
303303
}
@@ -2268,7 +2268,7 @@ eval0(
22682268
if (end_error)
22692269
semsg(_(e_trailing_arg), p);
22702270
else
2271-
semsg(_(e_invexpr2), arg);
2271+
semsg(_(e_invalid_expression_str), arg);
22722272
}
22732273

22742274
// Some of the expression may not have been consumed. Do not check for
@@ -2758,7 +2758,7 @@ eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
27582758

27592759
if (vim9script && type_is && (p[len] == '?' || p[len] == '#'))
27602760
{
2761-
semsg(_(e_invexpr2), p);
2761+
semsg(_(e_invalid_expression_str), p);
27622762
clear_tv(rettv);
27632763
return FAIL;
27642764
}
@@ -3367,7 +3367,7 @@ eval_leader(char_u **arg, int vim9)
33673367
// ++, --, -+ and +- are not accepted in Vim9 script
33683368
if (vim9 && (*p == '-' || *p == '+') && (*n == '-' || *n == '+'))
33693369
{
3370-
semsg(_(e_invexpr2), s);
3370+
semsg(_(e_invalid_expression_str), s);
33713371
return FAIL;
33723372
}
33733373
p = n;
@@ -3441,7 +3441,7 @@ eval7(
34413441
#endif
34423442
))
34433443
{
3444-
semsg(_(e_invexpr2), *arg);
3444+
semsg(_(e_invalid_expression_str), *arg);
34453445
++*arg;
34463446
return FAIL;
34473447
}
@@ -5607,7 +5607,7 @@ get_name_len(
56075607
// Only give an error when there is something, otherwise it will be
56085608
// reported at a higher level.
56095609
if (len == 0 && verbose && **arg != NUL)
5610-
semsg(_(e_invexpr2), *arg);
5610+
semsg(_(e_invalid_expression_str), *arg);
56115611

56125612
return len;
56135613
}
@@ -6153,7 +6153,7 @@ ex_echo(exarg_T *eap)
61536153
*/
61546154
if (!aborting() && did_emsg == did_emsg_before
61556155
&& called_emsg == called_emsg_before)
6156-
semsg(_(e_invexpr2), arg_start);
6156+
semsg(_(e_invalid_expression_str), arg_start);
61576157
need_clr_eos = FALSE;
61586158
break;
61596159
}

‎src/evalfunc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2923,7 +2923,7 @@ f_eval(typval_T *argvars, typval_T *rettv)
29232923
if (s == NULL || eval1(&s, rettv, &EVALARG_EVALUATE) == FAIL)
29242924
{
29252925
if (p != NULL && !aborting())
2926-
semsg(_(e_invexpr2), p);
2926+
semsg(_(e_invalid_expression_str), p);
29272927
need_clr_eos = FALSE;
29282928
rettv->v_type = VAR_NUMBER;
29292929
rettv->vval.v_number = 0;

‎src/evalvars.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ ex_let_one(
13341334
semsg(_(e_letwrong), op);
13351335
else if (endchars != NULL
13361336
&& vim_strchr(endchars, *skipwhite(arg)) == NULL)
1337-
emsg(_(e_letunexp));
1337+
emsg(_(e_unexpected_characters_in_let));
13381338
else if (!check_secure())
13391339
{
13401340
c1 = name[len];
@@ -1379,7 +1379,7 @@ ex_let_one(
13791379
p = find_option_end(&arg, &opt_flags);
13801380
if (p == NULL || (endchars != NULL
13811381
&& vim_strchr(endchars, *skipwhite(p)) == NULL))
1382-
emsg(_(e_letunexp));
1382+
emsg(_(e_unexpected_characters_in_let));
13831383
else
13841384
{
13851385
long n = 0;
@@ -1481,7 +1481,7 @@ ex_let_one(
14811481
semsg(_(e_letwrong), op);
14821482
else if (endchars != NULL
14831483
&& vim_strchr(endchars, *skipwhite(arg + 1)) == NULL)
1484-
emsg(_(e_letunexp));
1484+
emsg(_(e_unexpected_characters_in_let));
14851485
else
14861486
{
14871487
char_u *ptofree = NULL;
@@ -1520,7 +1520,7 @@ ex_let_one(
15201520
{
15211521
if (endchars != NULL && vim_strchr(endchars,
15221522
*skipwhite(lv.ll_name_end)) == NULL)
1523-
emsg(_(e_letunexp));
1523+
emsg(_(e_unexpected_characters_in_let));
15241524
else
15251525
{
15261526
set_var_lval(&lv, p, tv, copy, flags, op, var_idx);

‎src/evalwindow.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ get_winnr(tabpage_T *tp, typval_T *argvar)
363363

364364
if (invalid_arg)
365365
{
366-
semsg(_(e_invexpr2), arg);
366+
semsg(_(e_invalid_expression_str), arg);
367367
nr = 0;
368368
}
369369
}
@@ -636,7 +636,7 @@ f_tabpagenr(typval_T *argvars UNUSED, typval_T *rettv)
636636
nr = valid_tabpage(lastused_tabpage) ?
637637
tabpage_index(lastused_tabpage) : 0;
638638
else
639-
semsg(_(e_invexpr2), arg);
639+
semsg(_(e_invalid_expression_str), arg);
640640
}
641641
}
642642
else
@@ -726,7 +726,7 @@ f_win_gotoid(typval_T *argvars, typval_T *rettv)
726726
#ifdef FEAT_CMDWIN
727727
if (cmdwin_type != 0)
728728
{
729-
emsg(_(e_cmdwin));
729+
emsg(_(e_invalid_in_cmdline_window));
730730
return;
731731
}
732732
#endif

‎src/ex_cmds.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2120,7 +2120,7 @@ check_overwrite(
21202120
// with UNIX it is possible to open a directory
21212121
if (mch_isdir(ffname))
21222122
{
2123-
semsg(_(e_isadir2), ffname);
2123+
semsg(_(e_src_is_directory), ffname);
21242124
return FAIL;
21252125
}
21262126
#endif
@@ -2137,7 +2137,7 @@ check_overwrite(
21372137
else
21382138
#endif
21392139
{
2140-
emsg(_(e_exists));
2140+
emsg(_(e_file_exists));
21412141
return FAIL;
21422142
}
21432143
}
@@ -3586,7 +3586,7 @@ check_secure(void)
35863586
if (secure)
35873587
{
35883588
secure = 2;
3589-
emsg(_(e_curdir));
3589+
emsg(_(e_command_not_allowed_from_vimrc_in_current_dir_or_tag_search));
35903590
return TRUE;
35913591
}
35923592
#ifdef HAVE_SANDBOX
@@ -3729,7 +3729,7 @@ ex_substitute(exarg_T *eap)
37293729
++cmd;
37303730
if (vim_strchr((char_u *)"/?&", *cmd) == NULL)
37313731
{
3732-
emsg(_(e_backslash));
3732+
emsg(_(e_backslash_should_be_followed_by));
37333733
return;
37343734
}
37353735
if (*cmd != '&')
@@ -3944,7 +3944,7 @@ ex_substitute(exarg_T *eap)
39443944
if (!subflags.do_count && !curbuf->b_p_ma)
39453945
{
39463946
// Substitution is not allowed in non-'modifiable' buffer
3947-
emsg(_(e_modifiable));
3947+
emsg(_(e_cannot_make_changes_modifiable_is_off));
39483948
return;
39493949
}
39503950

@@ -4903,7 +4903,7 @@ ex_global(exarg_T *eap)
49034903
++cmd;
49044904
if (vim_strchr((char_u *)"/?&", *cmd) == NULL)
49054905
{
4906-
emsg(_(e_backslash));
4906+
emsg(_(e_backslash_should_be_followed_by));
49074907
return;
49084908
}
49094909
if (*cmd == '&')

0 commit comments

Comments
 (0)