diff options
| -rw-r--r-- | src/dict.c | 4 | ||||
| -rw-r--r-- | src/errors.h | 4 | ||||
| -rw-r--r-- | src/list.c | 3 | ||||
| -rw-r--r-- | src/userfunc.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 10 | ||||
| -rw-r--r-- | src/vim9type.c | 5 |
7 files changed, 18 insertions, 14 deletions
diff --git a/src/dict.c b/src/dict.c index b40aaef0d..b36b2bf6d 100644 --- a/src/dict.c +++ b/src/dict.c @@ -945,7 +945,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) if (**arg != ':') { if (*skipwhite(*arg) == ':') - semsg(_(e_no_white_space_allowed_before_str), ":"); + semsg(_(e_no_white_space_allowed_before_str_str), ":", *arg); else semsg(_(e_missing_dict_colon), *arg); clear_tv(&tvkey); @@ -1025,7 +1025,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) if (!had_comma) { if (**arg == ',') - semsg(_(e_no_white_space_allowed_before_str), ","); + semsg(_(e_no_white_space_allowed_before_str_str), ",", *arg); else semsg(_(e_missing_dict_comma), *arg); goto failret; diff --git a/src/errors.h b/src/errors.h index 921b9df5c..9b9a78275 100644 --- a/src/errors.h +++ b/src/errors.h @@ -173,8 +173,8 @@ EXTERN char e_cannot_declare_a_register_str[] INIT(= N_("E1066: Cannot declare a register: %s")); EXTERN char e_separator_mismatch_str[] INIT(= N_("E1067: Separator mismatch: %s")); -EXTERN char e_no_white_space_allowed_before_str[] - INIT(= N_("E1068: No white space allowed before '%s'")); +EXTERN char e_no_white_space_allowed_before_str_str[] + INIT(= N_("E1068: No white space allowed before '%s': %s")); EXTERN char e_white_space_required_after_str_str[] INIT(= N_("E1069: White space required after '%s': %s")); EXTERN char e_missing_from[] diff --git a/src/list.c b/src/list.c index c93a66d81..4d33aa6e0 100644 --- a/src/list.c +++ b/src/list.c @@ -1328,7 +1328,8 @@ eval_list(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error) if (do_error) { if (**arg == ',') - semsg(_(e_no_white_space_allowed_before_str), ","); + semsg(_(e_no_white_space_allowed_before_str_str), + ",", *arg); else semsg(_("E696: Missing comma in List: %s"), *arg); } diff --git a/src/userfunc.c b/src/userfunc.c index 82df0bb96..c9b15fd63 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -878,7 +878,7 @@ get_func_tv( { if (*argp != ',' && *skipwhite(argp) == ',') { - semsg(_(e_no_white_space_allowed_before_str), ","); + semsg(_(e_no_white_space_allowed_before_str_str), ",", argp); ret = FAIL; break; } @@ -3214,7 +3214,7 @@ define_function(exarg_T *eap, char_u *name_arg) if ((vim9script || eap->cmdidx == CMD_def) && VIM_ISWHITE(p[-1])) { - semsg(_(e_no_white_space_allowed_before_str), "("); + semsg(_(e_no_white_space_allowed_before_str_str), "(", p - 1); goto ret_free; } diff --git a/src/version.c b/src/version.c index ca79c64dd..e203038df 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2486, +/**/ 2485, /**/ 2484, diff --git a/src/vim9compile.c b/src/vim9compile.c index 7a220a851..512f7246c 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2800,7 +2800,7 @@ compile_arguments(char_u **arg, cctx_T *cctx, int *argcount) if (*p != ',' && *skipwhite(p) == ',') { - semsg(_(e_no_white_space_allowed_before_str), ","); + semsg(_(e_no_white_space_allowed_before_str_str), ",", p); p = skipwhite(p); } if (*p == ',') @@ -3055,7 +3055,7 @@ compile_list(char_u **arg, cctx_T *cctx, ppconst_T *ppconst) } if (*p == ',') { - semsg(_(e_no_white_space_allowed_before_str), ","); + semsg(_(e_no_white_space_allowed_before_str_str), ",", p); return FAIL; } if (*p == ']') @@ -3234,7 +3234,7 @@ compile_dict(char_u **arg, cctx_T *cctx, ppconst_T *ppconst) if (**arg != ':') { if (*skipwhite(*arg) == ':') - semsg(_(e_no_white_space_allowed_before_str), ":"); + semsg(_(e_no_white_space_allowed_before_str_str), ":", *arg); else semsg(_(e_missing_dict_colon), *arg); return FAIL; @@ -3273,7 +3273,7 @@ compile_dict(char_u **arg, cctx_T *cctx, ppconst_T *ppconst) } if (IS_WHITE_OR_NUL(*whitep)) { - semsg(_(e_no_white_space_allowed_before_str), ","); + semsg(_(e_no_white_space_allowed_before_str_str), ",", whitep); return FAIL; } whitep = *arg + 1; @@ -4270,7 +4270,7 @@ compile_expr7t(char_u **arg, cctx_T *cctx, ppconst_T *ppconst) if (**arg != '>') { if (*skipwhite(*arg) == '>') - semsg(_(e_no_white_space_allowed_before_str), ">"); + semsg(_(e_no_white_space_allowed_before_str_str), ">", *arg); else emsg(_(e_missing_gt)); return FAIL; diff --git a/src/vim9type.c b/src/vim9type.c index dbe7db92c..1a20ef579 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -638,7 +638,7 @@ parse_type_member( if (give_error) { if (*skipwhite(*arg) == '<') - semsg(_(e_no_white_space_allowed_before_str), "<"); + semsg(_(e_no_white_space_allowed_before_str_str), "<", *arg); else emsg(_(e_missing_type)); } @@ -779,7 +779,8 @@ parse_type(char_u **arg, garray_T *type_gap, int give_error) if (*p != ',' && *skipwhite(p) == ',') { if (give_error) - semsg(_(e_no_white_space_allowed_before_str), ","); + semsg(_(e_no_white_space_allowed_before_str_str), + ",", p); return NULL; } if (*p == ',') |