comparison src/userfunc.c @ 26602:fac6673086df v8.2.3830

patch 8.2.3830: error messages are spread out Commit: https://github.com/vim/vim/commit/e124204c4f8ea8b4fe5357b7613092a7acb5feb8 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 16 20:56:57 2021 +0000 patch 8.2.3830: error messages are spread out Problem: Error messages are spread out. Solution: Move more error messages to errors.h.
author Bram Moolenaar <Bram@vim.org>
date Thu, 16 Dec 2021 22:00:05 +0100
parents 5f4198087073
children 9c9b8d95b05f
comparison
equal deleted inserted replaced
26601:dd5a2a697523 26602:fac6673086df
1778 else if (!aborting()) 1778 else if (!aborting())
1779 { 1779 {
1780 if (argcount == MAX_FUNC_ARGS) 1780 if (argcount == MAX_FUNC_ARGS)
1781 emsg_funcname(N_("E740: Too many arguments for function %s"), name); 1781 emsg_funcname(N_("E740: Too many arguments for function %s"), name);
1782 else 1782 else
1783 emsg_funcname(N_("E116: Invalid arguments for function %s"), name); 1783 emsg_funcname(N_(e_invalid_arguments_for_function_str), name);
1784 } 1784 }
1785 1785
1786 while (--argcount >= 0) 1786 while (--argcount >= 0)
1787 clear_tv(&argvars[argcount]); 1787 clear_tv(&argvars[argcount]);
1788 1788
3238 { 3238 {
3239 case FCERR_UNKNOWN: 3239 case FCERR_UNKNOWN:
3240 if (funcexe->fe_found_var) 3240 if (funcexe->fe_found_var)
3241 semsg(_(e_not_callable_type_str), name); 3241 semsg(_(e_not_callable_type_str), name);
3242 else 3242 else
3243 emsg_funcname(e_unknownfunc, name); 3243 emsg_funcname(e_unknown_function_str, name);
3244 break; 3244 break;
3245 case FCERR_NOTMETHOD: 3245 case FCERR_NOTMETHOD:
3246 emsg_funcname( 3246 emsg_funcname(
3247 N_("E276: Cannot use function as a method: %s"), name); 3247 N_("E276: Cannot use function as a method: %s"), name);
3248 break; 3248 break;
3249 case FCERR_DELETED: 3249 case FCERR_DELETED:
3250 emsg_funcname(N_(e_func_deleted), name); 3250 emsg_funcname(N_(e_func_deleted), name);
3251 break; 3251 break;
3252 case FCERR_TOOMANY: 3252 case FCERR_TOOMANY:
3253 emsg_funcname((char *)e_toomanyarg, name); 3253 emsg_funcname((char *)e_too_many_arguments_for_function_str,
3254 name);
3254 break; 3255 break;
3255 case FCERR_TOOFEW: 3256 case FCERR_TOOFEW:
3256 emsg_funcname((char *)e_toofewarg, name); 3257 emsg_funcname((char *)e_not_enough_arguments_for_function_str,
3258 name);
3257 break; 3259 break;
3258 case FCERR_SCRIPT: 3260 case FCERR_SCRIPT:
3259 emsg_funcname( 3261 emsg_funcname(
3260 N_("E120: Using <SID> not in a script context: %s"), name); 3262 N_(e_using_sid_not_in_script_context_str), name);
3261 break; 3263 break;
3262 case FCERR_DICT: 3264 case FCERR_DICT:
3263 emsg_funcname( 3265 emsg_funcname(
3264 N_("E725: Calling dict function without Dictionary: %s"), 3266 N_("E725: Calling dict function without Dictionary: %s"),
3265 name); 3267 name);
5096 // Skip white space to allow ":call func ()". Not good, but required for 5098 // Skip white space to allow ":call func ()". Not good, but required for
5097 // backward compatibility. 5099 // backward compatibility.
5098 startarg = skipwhite(arg); 5100 startarg = skipwhite(arg);
5099 if (*startarg != '(') 5101 if (*startarg != '(')
5100 { 5102 {
5101 semsg(_(e_missing_paren), eap->arg); 5103 semsg(_(e_missing_parenthesis_str), eap->arg);
5102 goto end; 5104 goto end;
5103 } 5105 }
5104 if (in_vim9script() && startarg > arg) 5106 if (in_vim9script() && startarg > arg)
5105 { 5107 {
5106 semsg(_(e_no_white_space_allowed_before_str_str), "(", eap->arg); 5108 semsg(_(e_no_white_space_allowed_before_str_str), "(", eap->arg);