To: vim_dev@googlegroups.com Subject: Patch 8.2.3961 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3961 Problem: Error messages are spread out. Solution: Move more errors to errors.h. Files: src/errors.h, src/globals.h src/arglist.c, src/autocmd.c, src/blob.c, src/bufwrite.c, src/channel.c, src/clipboard.c, src/cmdexpand.c, src/debugger.c, src/dict.c, src/eval.c, src/evalfunc.c, src/evalvars.c, src/evalwindow.c, src/ex_cmds.c, src/ex_docmd.c, src/ex_eval.c, src/ex_getln.c, src/fileio.c, src/filepath.c, src/gui_gtk_x11.c, src/gui_haiku.cc, src/gui_photon.c, src/gui_w32.c, src/gui_x11.c, src/highlight.c, src/indent.c, src/insexpand.c, src/job.c, src/json.c, src/list.c, src/map.c, src/mark.c, src/match.c, src/mbyte.c, src/menu.c, src/message.c, src/misc2.c, src/ops.c, src/option.c, src/optionstr.c, src/popupwin.c, src/quickfix.c, src/screen.c, src/scriptfile.c, src/search.c, src/sign.c, src/spell.c, src/spellfile.c, src/strings.c, src/syntax.c, src/terminal.c, src/testing.c, src/textprop.c, src/time.c, src/userfunc.c, src/vim9cmds.c, src/vim9execute.c, src/vim9script.c, src/window.c *** ../vim-8.2.3960/src/errors.h 2021-12-31 19:59:48.866000515 +0000 --- src/errors.h 2021-12-31 22:44:07.727569136 +0000 *************** *** 10,15 **** --- 10,18 ---- * Definition of error messages, sorted on error number. */ + EXTERN char e_interrupted[] + INIT(= N_("Interrupted")); + EXTERN char e_backslash_should_be_followed_by[] INIT(= N_("E10: \\ should be followed by /, ? or &")); #ifdef FEAT_CMDWIN *************** *** 494,500 **** EXTERN char e_cannot_start_the_GUI[] INIT(= N_("E229: Cannot start the GUI")); ! EXTERN char e_window_layout_changed_unexpectedly[] INIT(= N_("E249: window layout changed unexpectedly")); #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) --- 497,515 ---- EXTERN char e_cannot_start_the_GUI[] INIT(= N_("E229: Cannot start the GUI")); ! #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) ! EXTERN char e_unknown_fontset_str[] ! INIT(= N_("E234: Unknown fontset: %s")); ! #endif ! #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) \ ! || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_HAIKU) ! EXTERN char e_unknown_font_str[] ! INIT(= N_("E235: Unknown font: %s")); ! #endif ! #if defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) ! EXTERN char e_font_str_is_not_fixed_width[] ! INIT(= N_("E236: Font \"%s\" is not fixed-width")); ! #endif EXTERN char e_window_layout_changed_unexpectedly[] INIT(= N_("E249: window layout changed unexpectedly")); #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) *************** *** 513,518 **** --- 528,549 ---- EXTERN char e_ambiguous_use_of_user_defined_command[] INIT(= N_("E464: Ambiguous use of user-defined command")); + EXTERN char e_command_aborted[] + INIT(= N_("E470: Command aborted")); + EXTERN char e_argument_required[] + INIT(= N_("E471: Argument required")); + EXTERN char e_command_failed[] + INIT(= N_("E472: Command failed")); + EXTERN char e_internal_error_in_regexp[] + INIT(= N_("E473: Internal error in regexp")); + EXTERN char e_invalid_argument[] + INIT(= N_("E474: Invalid argument")); + EXTERN char e_invalid_argument_str[] + INIT(= N_("E475: Invalid argument: %s")); + EXTERN char e_invalid_value_for_argument_str[] + INIT(= N_("E475: Invalid value for argument %s")); + 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")); #ifdef FEAT_EVAL *************** *** 556,561 **** --- 587,608 ---- INIT(= N_("E516: No buffers were deleted")); EXTERN char e_no_buffers_were_wiped_out[] INIT(= N_("E517: No buffers were wiped out")); + #ifdef FEAT_EVAL + EXTERN char e_endwhile_without_while[] + INIT(= N_("E588: :endwhile without :while")); + EXTERN char e_endfor_without_for[] + INIT(= N_("E588: :endfor without :for")); + EXTERN char e_missing_endtry[] + INIT(= N_("E600: Missing :endtry")); + EXTERN char e_endtry_without_try[] + INIT(= N_("E602: :endtry without :try")); + EXTERN char e_catch_without_try[] + INIT(= N_("E603: :catch without :try")); + EXTERN char e_finally_without_try[] + INIT(= N_("E606: :finally without :try")); + EXTERN char e_multiple_finally[] + INIT(= N_("E607: multiple :finally")); + #endif EXTERN char e_no_argument_to_delete[] INIT(= N_("E610: No argument to delete")); *** ../vim-8.2.3960/src/globals.h 2021-12-31 17:25:44.040304835 +0000 --- src/globals.h 2021-12-31 20:53:12.863966515 +0000 *************** *** 1600,1638 **** #endif /* ! * The error messages that can be shared are included here. ! * Excluded are errors that are only used once and debugging messages. */ - EXTERN char e_abort[] INIT(= N_("E470: Command aborted")); - EXTERN char e_argreq[] INIT(= N_("E471: Argument required")); - #ifdef FEAT_EVAL - EXTERN char e_catch[] INIT(= N_("E603: :catch without :try")); - EXTERN char e_finally[] INIT(= N_("E606: :finally without :try")); - EXTERN char e_finally_dup[] INIT(= N_("E607: multiple :finally")); - EXTERN char e_endtry[] INIT(= N_("E600: Missing :endtry")); - EXTERN char e_no_endtry[] INIT(= N_("E602: :endtry without :try")); - EXTERN char e_while[] INIT(= N_("E588: :endwhile without :while")); - EXTERN char e_for[] INIT(= N_("E588: :endfor without :for")); - #endif - EXTERN char e_failed[] INIT(= N_("E472: Command failed")); - #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) - EXTERN char e_fontset[] INIT(= N_("E234: Unknown fontset: %s")); - #endif - #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) \ - || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_HAIKU) - EXTERN char e_font[] INIT(= N_("E235: Unknown font: %s")); - #endif - #if defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) - EXTERN char e_fontwidth[] INIT(= N_("E236: Font \"%s\" is not fixed-width")); - #endif - EXTERN char e_internal[] INIT(= N_("E473: Internal error")); EXTERN char e_intern2[] INIT(= N_("E685: Internal error: %s")); - EXTERN char e_interr[] INIT(= N_("Interrupted")); - EXTERN char e_invarg[] INIT(= N_("E474: Invalid argument")); - EXTERN char e_invarg2[] INIT(= N_("E475: Invalid argument: %s")); EXTERN char e_duparg2[] INIT(= N_("E983: Duplicate argument: %s")); - EXTERN char e_invargval[] INIT(= N_("E475: Invalid value for argument %s")); - EXTERN char e_invargNval[] INIT(= N_("E475: Invalid value for argument %s: %s")); #ifdef FEAT_SPELL EXTERN char e_no_spell[] INIT(= N_("E756: Spell checking is not possible")); #endif --- 1600,1610 ---- #endif /* ! * Some error messages that can be shared are included here. ! * They should be moved to errors.h. */ EXTERN char e_intern2[] INIT(= N_("E685: Internal error: %s")); EXTERN char e_duparg2[] INIT(= N_("E983: Duplicate argument: %s")); #ifdef FEAT_SPELL EXTERN char e_no_spell[] INIT(= N_("E756: Spell checking is not possible")); #endif *** ../vim-8.2.3960/src/arglist.c 2021-12-31 19:59:48.866000515 +0000 --- src/arglist.c 2021-12-31 20:55:14.415757454 +0000 *************** *** 850,856 **** n = eap->line2 - eap->line1 + 1; if (*eap->arg != NUL) // Can't have both a range and an argument. ! emsg(_(e_invarg)); else if (n <= 0) { // Don't give an error for ":%argdel" if the list is empty. --- 850,856 ---- n = eap->line2 - eap->line1 + 1; if (*eap->arg != NUL) // Can't have both a range and an argument. ! emsg(_(e_invalid_argument)); else if (n <= 0) { // Don't give an error for ":%argdel" if the list is empty. *** ../vim-8.2.3960/src/autocmd.c 2021-12-31 19:59:48.866000515 +0000 --- src/autocmd.c 2021-12-31 20:34:29.985756525 +0000 *************** *** 580,586 **** if (del_group) { if (*arg == NUL) ! emsg(_(e_argreq)); else au_del_group(arg); } --- 580,586 ---- if (del_group) { if (*arg == NUL) ! emsg(_(e_argument_required)); else au_del_group(arg); } *** ../vim-8.2.3960/src/blob.c 2021-12-31 19:59:48.866000515 +0000 --- src/blob.c 2021-12-31 21:03:12.666983658 +0000 *************** *** 614,620 **** return; // type error; errmsg already given if (before < 0 || before > len) { ! semsg(_(e_invarg2), tv_get_string(&argvars[2])); return; } } --- 614,620 ---- return; // type error; errmsg already given if (before < 0 || before > len) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[2])); return; } } *************** *** 623,629 **** return; if (val < 0 || val > 255) { ! semsg(_(e_invarg2), tv_get_string(&argvars[1])); return; } --- 623,629 ---- return; if (val < 0 || val > 255) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[1])); return; } *** ../vim-8.2.3960/src/bufwrite.c 2021-12-31 19:59:48.870000502 +0000 --- src/bufwrite.c 2021-12-31 20:51:19.760159808 +0000 *************** *** 1482,1488 **** ui_breakcheck(); if (got_int) { ! errmsg = (char_u *)_(e_interr); break; } } --- 1482,1488 ---- ui_breakcheck(); if (got_int) { ! errmsg = (char_u *)_(e_interrupted); break; } } *************** *** 1649,1655 **** ml_preserve(buf, FALSE); if (got_int) { ! errmsg = (char_u *)_(e_interr); goto restore_backup; } } --- 1649,1655 ---- ml_preserve(buf, FALSE); if (got_int) { ! errmsg = (char_u *)_(e_interrupted); goto restore_backup; } } *************** *** 2295,2301 **** } } else if (got_int) ! errmsg = (char_u *)_(e_interr); else errmsg = (char_u *)_(e_write_error_file_system_full); } --- 2295,2301 ---- } } else if (got_int) ! errmsg = (char_u *)_(e_interrupted); else errmsg = (char_u *)_(e_write_error_file_system_full); } *************** *** 2315,2321 **** // know we got the message. if (got_int) { ! msg(_(e_interr)); out_flush(); } if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0) --- 2315,2321 ---- // know we got the message. if (got_int) { ! msg(_(e_interrupted)); out_flush(); } if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0) *** ../vim-8.2.3960/src/channel.c 2021-12-09 10:50:48.562865618 +0000 --- src/channel.c 2021-12-31 21:03:19.922975426 +0000 *************** *** 1318,1324 **** if (argvars[1].v_type != VAR_UNKNOWN && (argvars[1].v_type != VAR_DICT || argvars[1].vval.v_dict == NULL)) { ! emsg(_(e_invarg)); return NULL; } --- 1318,1324 ---- if (argvars[1].v_type != VAR_UNKNOWN && (argvars[1].v_type != VAR_DICT || argvars[1].vval.v_dict == NULL)) { ! emsg(_(e_invalid_argument)); return NULL; } *************** *** 1330,1336 **** p = vim_strchr(address + 1, ']'); if (p == NULL || *++p != ':') { ! semsg(_(e_invarg2), address); return NULL; } } --- 1330,1336 ---- p = vim_strchr(address + 1, ']'); if (p == NULL || *++p != ':') { ! semsg(_(e_invalid_argument_str), address); return NULL; } } *************** *** 1339,1352 **** p = vim_strchr(address, ':'); if (p == NULL) { ! semsg(_(e_invarg2), address); return NULL; } } port = strtol((char *)(p + 1), &rest, 10); if (*address == NUL || port <= 0 || port >= 65536 || *rest != NUL) { ! semsg(_(e_invarg2), address); return NULL; } if (is_ipv6) --- 1339,1352 ---- p = vim_strchr(address, ':'); if (p == NULL) { ! semsg(_(e_invalid_argument_str), address); return NULL; } } port = strtol((char *)(p + 1), &rest, 10); if (*address == NUL || port <= 0 || port >= 65536 || *rest != NUL) { ! semsg(_(e_invalid_argument_str), address); return NULL; } if (is_ipv6) *************** *** 1367,1373 **** goto theend; if (opt.jo_timeout < 0) { ! emsg(_(e_invarg)); goto theend; } --- 1367,1373 ---- goto theend; if (opt.jo_timeout < 0) { ! emsg(_(e_invalid_argument)); goto theend; } *************** *** 3833,3839 **** } else { ! semsg(_(e_invarg2), tv_get_string(tv)); return NULL; } if (channel != NULL && reading) --- 3833,3839 ---- } else { ! semsg(_(e_invalid_argument_str), tv_get_string(tv)); return NULL; } if (channel != NULL && reading) *** ../vim-8.2.3960/src/clipboard.c 2021-12-27 17:21:38.004449137 +0000 --- src/clipboard.c 2021-12-31 20:55:28.035733957 +0000 *************** *** 1305,1316 **** p += 8; new_exclude_prog = vim_regcomp(p, RE_MAGIC); if (new_exclude_prog == NULL) ! errmsg = e_invarg; break; } else { ! errmsg = e_invarg; break; } if (*p == ',') --- 1305,1316 ---- p += 8; new_exclude_prog = vim_regcomp(p, RE_MAGIC); if (new_exclude_prog == NULL) ! errmsg = e_invalid_argument; break; } else { ! errmsg = e_invalid_argument; break; } if (*p == ',') *** ../vim-8.2.3960/src/cmdexpand.c 2021-12-05 21:46:31.172891155 +0000 --- src/cmdexpand.c 2021-12-31 21:03:26.230968241 +0000 *************** *** 2903,2909 **** pat = tv_get_string(&argvars[0]); if (argvars[1].v_type != VAR_STRING) { ! semsg(_(e_invarg2), "type must be a string"); return; } type = tv_get_string(&argvars[1]); --- 2903,2909 ---- pat = tv_get_string(&argvars[0]); if (argvars[1].v_type != VAR_STRING) { ! semsg(_(e_invalid_argument_str), "type must be a string"); return; } type = tv_get_string(&argvars[1]); *************** *** 2933,2939 **** xpc.xp_context = cmdcomplete_str_to_type(type); if (xpc.xp_context == EXPAND_NOTHING) { ! semsg(_(e_invarg2), type); return; } --- 2933,2939 ---- xpc.xp_context = cmdcomplete_str_to_type(type); if (xpc.xp_context == EXPAND_NOTHING) { ! semsg(_(e_invalid_argument_str), type); return; } *** ../vim-8.2.3960/src/debugger.c 2021-12-31 15:09:23.334140877 +0000 --- src/debugger.c 2021-12-31 21:03:30.234963637 +0000 *************** *** 594,600 **** bp->dbg_type = DBG_EXPR; else { ! semsg(_(e_invarg2), p); return FAIL; } p = skipwhite(p + 4); --- 594,600 ---- bp->dbg_type = DBG_EXPR; else { ! semsg(_(e_invalid_argument_str), p); return FAIL; } p = skipwhite(p + 4); *************** *** 619,625 **** || (here && *p != NUL) || (bp->dbg_type == DBG_FUNC && strstr((char *)p, "()") != NULL)) { ! semsg(_(e_invarg2), arg); return FAIL; } --- 619,625 ---- || (here && *p != NUL) || (bp->dbg_type == DBG_FUNC && strstr((char *)p, "()") != NULL)) { ! semsg(_(e_invalid_argument_str), arg); return FAIL; } *** ../vim-8.2.3960/src/dict.c 2021-12-22 20:29:06.232685076 +0000 --- src/dict.c 2021-12-31 21:03:33.894959443 +0000 *************** *** 720,726 **** return 0; if (di->di_tv.v_type != VAR_NUMBER) { ! semsg(_(e_invarg2), tv_get_string(&di->di_tv)); return 0; } return tv_get_number(&di->di_tv); --- 720,726 ---- return 0; if (di->di_tv.v_type != VAR_NUMBER) { ! semsg(_(e_invalid_argument_str), tv_get_string(&di->di_tv)); return 0; } return tv_get_number(&di->di_tv); *************** *** 1257,1263 **** break; if (i == 3) { ! semsg(_(e_invarg2), action); return; } } --- 1257,1263 ---- break; if (i == 3) { ! semsg(_(e_invalid_argument_str), action); return; } } *** ../vim-8.2.3960/src/errors.h 2021-12-31 19:59:48.866000515 +0000 --- src/errors.h 2021-12-31 22:44:07.727569136 +0000 *************** *** 10,15 **** --- 10,18 ---- * Definition of error messages, sorted on error number. */ + EXTERN char e_interrupted[] + INIT(= N_("Interrupted")); + EXTERN char e_backslash_should_be_followed_by[] INIT(= N_("E10: \\ should be followed by /, ? or &")); #ifdef FEAT_CMDWIN *************** *** 494,500 **** EXTERN char e_cannot_start_the_GUI[] INIT(= N_("E229: Cannot start the GUI")); ! EXTERN char e_window_layout_changed_unexpectedly[] INIT(= N_("E249: window layout changed unexpectedly")); #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) --- 497,515 ---- EXTERN char e_cannot_start_the_GUI[] INIT(= N_("E229: Cannot start the GUI")); ! #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) ! EXTERN char e_unknown_fontset_str[] ! INIT(= N_("E234: Unknown fontset: %s")); ! #endif ! #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) \ ! || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_HAIKU) ! EXTERN char e_unknown_font_str[] ! INIT(= N_("E235: Unknown font: %s")); ! #endif ! #if defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) ! EXTERN char e_font_str_is_not_fixed_width[] ! INIT(= N_("E236: Font \"%s\" is not fixed-width")); ! #endif EXTERN char e_window_layout_changed_unexpectedly[] INIT(= N_("E249: window layout changed unexpectedly")); #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) *************** *** 513,518 **** --- 528,549 ---- EXTERN char e_ambiguous_use_of_user_defined_command[] INIT(= N_("E464: Ambiguous use of user-defined command")); + EXTERN char e_command_aborted[] + INIT(= N_("E470: Command aborted")); + EXTERN char e_argument_required[] + INIT(= N_("E471: Argument required")); + EXTERN char e_command_failed[] + INIT(= N_("E472: Command failed")); + EXTERN char e_internal_error_in_regexp[] + INIT(= N_("E473: Internal error in regexp")); + EXTERN char e_invalid_argument[] + INIT(= N_("E474: Invalid argument")); + EXTERN char e_invalid_argument_str[] + INIT(= N_("E475: Invalid argument: %s")); + EXTERN char e_invalid_value_for_argument_str[] + INIT(= N_("E475: Invalid value for argument %s")); + 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")); #ifdef FEAT_EVAL *************** *** 556,561 **** --- 587,608 ---- INIT(= N_("E516: No buffers were deleted")); EXTERN char e_no_buffers_were_wiped_out[] INIT(= N_("E517: No buffers were wiped out")); + #ifdef FEAT_EVAL + EXTERN char e_endwhile_without_while[] + INIT(= N_("E588: :endwhile without :while")); + EXTERN char e_endfor_without_for[] + INIT(= N_("E588: :endfor without :for")); + EXTERN char e_missing_endtry[] + INIT(= N_("E600: Missing :endtry")); + EXTERN char e_endtry_without_try[] + INIT(= N_("E602: :endtry without :try")); + EXTERN char e_catch_without_try[] + INIT(= N_("E603: :catch without :try")); + EXTERN char e_finally_without_try[] + INIT(= N_("E606: :finally without :try")); + EXTERN char e_multiple_finally[] + INIT(= N_("E607: multiple :finally")); + #endif EXTERN char e_no_argument_to_delete[] INIT(= N_("E610: No argument to delete")); *** ../vim-8.2.3960/src/eval.c 2021-12-27 20:57:03.483387913 +0000 --- src/eval.c 2021-12-31 21:03:37.418955400 +0000 *************** *** 869,875 **** if (!aborting() && !quiet) { emsg_severe = TRUE; ! semsg(_(e_invarg2), name); return NULL; } } --- 869,875 ---- if (!aborting() && !quiet) { emsg_severe = TRUE; ! semsg(_(e_invalid_argument_str), name); return NULL; } } *** ../vim-8.2.3960/src/evalfunc.c 2021-12-31 15:21:49.657260896 +0000 --- src/evalfunc.c 2021-12-31 22:19:18.945191039 +0000 *************** *** 3188,3194 **** if (list2fpos(argvars, &pos, NULL, &curswant, charcol) == FAIL) { ! emsg(_(e_invarg)); return; } line = pos.lnum; --- 3188,3194 ---- if (list2fpos(argvars, &pos, NULL, &curswant, charcol) == FAIL) { ! emsg(_(e_invalid_argument)); return; } line = pos.lnum; *************** *** 3207,3213 **** { line = tv_get_lnum(argvars); if (line < 0) ! semsg(_(e_invarg2), tv_get_string(&argvars[0])); col = (long)tv_get_number_chk(&argvars[1], NULL); if (charcol) col = buf_charidx_to_byteidx(curbuf, line, col) + 1; --- 3207,3213 ---- { line = tv_get_lnum(argvars); if (line < 0) ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[0])); col = (long)tv_get_number_chk(&argvars[1], NULL); if (charcol) col = buf_charidx_to_byteidx(curbuf, line, col) + 1; *************** *** 3216,3222 **** } else { ! emsg(_(e_invarg)); return; } if (line < 0 || col < 0 || coladd < 0) --- 3216,3222 ---- } else { ! emsg(_(e_invalid_argument)); return; } if (line < 0 || col < 0 || coladd < 0) *************** *** 3265,3271 **** pid = (int)tv_get_number(&argvars[0]); if (pid == 0) ! emsg(_(e_invarg)); else { HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, 0, pid); --- 3265,3271 ---- pid = (int)tv_get_number(&argvars[0]); if (pid == 0) ! emsg(_(e_invalid_argument)); else { HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, 0, pid); *************** *** 4094,4100 **** } if (s == NULL) { ! semsg(_(e_invarg2), "NULL"); return; } --- 4094,4100 ---- } if (s == NULL) { ! semsg(_(e_invalid_argument_str), "NULL"); return; } *************** *** 4109,4115 **** if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s)) || (is_funcref && trans_name == NULL)) ! semsg(_(e_invarg2), use_string ? tv_get_string(&argvars[0]) : s); // Don't check an autoload name for existence here. else if (trans_name != NULL && (is_funcref ? find_func(trans_name, is_global, NULL) == NULL --- 4109,4115 ---- if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s)) || (is_funcref && trans_name == NULL)) ! semsg(_(e_invalid_argument_str), use_string ? tv_get_string(&argvars[0]) : s); // Don't check an autoload name for existence here. else if (trans_name != NULL && (is_funcref ? find_func(trans_name, is_global, NULL) == NULL *************** *** 4402,4408 **** } } else ! semsg(_(e_invarg2), what); // When {what} == "dict" and pt->pt_dict == NULL, evaluate the // third argument --- 4402,4408 ---- } } else ! semsg(_(e_invalid_argument_str), what); // When {what} == "dict" and pt->pt_dict == NULL, evaluate the // third argument *************** *** 4887,4893 **** || argvars[0].vval.v_string == NULL || *argvars[0].vval.v_string == NUL) { ! semsg(_(e_invarg2), tv_get_string(&argvars[0])); } else { --- 4887,4893 ---- || argvars[0].vval.v_string == NULL || *argvars[0].vval.v_string == NUL) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[0])); } else { *************** *** 6697,6703 **** if (*end != NUL) { semsg(_(lv.ll_name == lv.ll_name_end ! ? e_invarg2 : e_trailing_arg), end); } else { --- 6697,6703 ---- if (*end != NUL) { semsg(_(lv.ll_name == lv.ll_name_end ! ? e_invalid_argument_str : e_trailing_arg), end); } else { *************** *** 7760,7766 **** return; theend: ! semsg(_(e_invarg2), tv_get_string(&argvars[0])); rettv->v_type = VAR_NUMBER; rettv->vval.v_number = -1; } --- 7760,7766 ---- return; theend: ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[0])); rettv->v_type = VAR_NUMBER; rettv->vval.v_number = -1; } *************** *** 8085,8091 **** } if (mask == 0) { ! semsg(_(e_invarg2), flags); dir = 0; } else --- 8085,8091 ---- } if (mask == 0) { ! semsg(_(e_invalid_argument_str), flags); dir = 0; } else *************** *** 8175,8181 **** if (((flags & (SP_REPEAT | SP_RETCOUNT)) != 0) || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK))) { ! semsg(_(e_invarg2), tv_get_string(&argvars[1])); goto theend; } --- 8175,8181 ---- if (((flags & (SP_REPEAT | SP_RETCOUNT)) != 0) || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK))) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[1])); goto theend; } *************** *** 8519,8525 **** if ((flags & (SP_END | SP_SUBPAT)) != 0 || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK))) { ! semsg(_(e_invarg2), tv_get_string(&argvars[3])); goto theend; } --- 8519,8525 ---- if ((flags & (SP_END | SP_SUBPAT)) != 0 || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK))) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[3])); goto theend; } *************** *** 8541,8547 **** lnum_stop = (long)tv_get_number_chk(&argvars[5], NULL); if (lnum_stop < 0) { ! semsg(_(e_invarg2), tv_get_string(&argvars[5])); goto theend; } #ifdef FEAT_RELTIME --- 8541,8547 ---- lnum_stop = (long)tv_get_number_chk(&argvars[5], NULL); if (lnum_stop < 0) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[5])); goto theend; } #ifdef FEAT_RELTIME *************** *** 8550,8556 **** time_limit = (long)tv_get_number_chk(&argvars[6], NULL); if (time_limit < 0) { ! semsg(_(e_invarg2), tv_get_string(&argvars[6])); goto theend; } } --- 8550,8556 ---- time_limit = (long)tv_get_number_chk(&argvars[6], NULL); if (time_limit < 0) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[6])); goto theend; } } *************** *** 8851,8857 **** rettv->vval.v_number = 0; } else ! emsg(_(e_invarg)); } } } --- 8851,8857 ---- rettv->vval.v_number = 0; } else ! emsg(_(e_invalid_argument)); } } } *************** *** 8966,8972 **** return; if (STRLEN(mode_str) != 9) { ! semsg(_(e_invarg2), mode_str); return; } --- 8966,8972 ---- return; if (STRLEN(mode_str) != 9) { ! semsg(_(e_invalid_argument_str), mode_str); return; } *************** *** 9085,9091 **** if (ret == FAIL || *++stropt != NUL) { ! semsg(_(e_invargval), "value"); return; } } --- 9085,9091 ---- if (ret == FAIL || *++stropt != NUL) { ! semsg(_(e_invalid_value_for_argument_str), "value"); return; } } *** ../vim-8.2.3960/src/evalvars.c 2021-12-31 18:49:39.145303432 +0000 --- src/evalvars.c 2021-12-31 21:03:59.750929332 +0000 *************** *** 792,798 **** { // ":let" without "=": list variables if (*arg == '[') ! emsg(_(e_invarg)); else if (expr[0] == '.' && expr[1] == '=') emsg(_("E985: .= is not supported with script version >= 2")); else if (!ends_excmd2(eap->cmd, arg)) --- 792,798 ---- { // ":let" without "=": list variables if (*arg == '[') ! emsg(_(e_invalid_argument)); else if (expr[0] == '.' && expr[1] == '=') emsg(_("E985: .= is not supported with script version >= 2")); else if (!ends_excmd2(eap->cmd, arg)) *************** *** 1049,1055 **** if (s == p) { if (!silent) ! semsg(_(e_invarg2), p); return NULL; } ++*var_count; --- 1049,1055 ---- if (s == p) { if (!silent) ! semsg(_(e_invalid_argument_str), p); return NULL; } ++*var_count; *************** *** 1069,1075 **** else if (*p != ',') { if (!silent) ! semsg(_(e_invarg2), p); return NULL; } } --- 1069,1075 ---- else if (*p != ',') { if (!silent) ! semsg(_(e_invalid_argument_str), p); return NULL; } } *************** *** 1220,1226 **** if (len < 0 && !aborting()) { emsg_severe = TRUE; ! semsg(_(e_invarg2), arg); break; } error = TRUE; --- 1220,1226 ---- if (len < 0 && !aborting()) { emsg_severe = TRUE; ! semsg(_(e_invalid_argument_str), arg); break; } error = TRUE; *************** *** 1316,1322 **** name = arg; len = get_env_len(&arg); if (len == 0) ! semsg(_(e_invarg2), name - 1); else { if (op != NULL && vim_strchr((char_u *)"+-*/%", *op) != NULL) --- 1316,1322 ---- name = arg; len = get_env_len(&arg); if (len == 0) ! semsg(_(e_invalid_argument_str), name - 1); else { if (op != NULL && vim_strchr((char_u *)"+-*/%", *op) != NULL) *************** *** 1606,1612 **** clear_lval(&lv); } else ! semsg(_(e_invarg2), arg); return arg_end; } --- 1606,1612 ---- clear_lval(&lv); } else ! semsg(_(e_invalid_argument_str), arg); return arg_end; } *************** *** 1668,1674 **** ++arg; if (get_env_len(&arg) == 0) { ! semsg(_(e_invarg2), arg - 1); return; } if (!error && !eap->skip --- 1668,1674 ---- ++arg; if (get_env_len(&arg) == 0) { ! semsg(_(e_invalid_argument_str), arg - 1); return; } if (!error && !eap->skip *************** *** 4016,4022 **** // Catch a bad name early. if (!eval_isnamec1(*name)) { ! emsg(_(e_invarg)); return FAIL; } --- 4016,4022 ---- // Catch a bad name early. if (!eval_isnamec1(*name)) { ! emsg(_(e_invalid_argument)); return FAIL; } *************** *** 4044,4050 **** // Trailing characters are present after the variable name semsg(_(e_trailing_arg), redir_endp); else ! semsg(_(e_invarg2), name); redir_endp = NULL; // don't store a value, only cleanup var_redir_stop(); return FAIL; --- 4044,4050 ---- // Trailing characters are present after the variable name semsg(_(e_trailing_arg), redir_endp); else ! semsg(_(e_invalid_argument_str), name); redir_endp = NULL; // don't store a value, only cleanup var_redir_stop(); return FAIL; *** ../vim-8.2.3960/src/evalwindow.c 2021-12-28 20:03:38.980797969 +0000 --- src/evalwindow.c 2021-12-31 20:55:43.763706807 +0000 *************** *** 928,934 **** if (argvars[2].v_type != VAR_DICT || argvars[2].vval.v_dict == NULL) { ! emsg(_(e_invarg)); return; } --- 928,934 ---- if (argvars[2].v_type != VAR_DICT || argvars[2].vval.v_dict == NULL) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1149,1155 **** if (argvars[0].v_type != VAR_DICT || (dict = argvars[0].vval.v_dict) == NULL) ! emsg(_(e_invarg)); else { if (dict_find(dict, (char_u *)"lnum", -1) != NULL) --- 1149,1155 ---- if (argvars[0].v_type != VAR_DICT || (dict = argvars[0].vval.v_dict) == NULL) ! emsg(_(e_invalid_argument)); else { if (dict_find(dict, (char_u *)"lnum", -1) != NULL) *** ../vim-8.2.3960/src/ex_cmds.c 2021-12-31 15:09:23.334140877 +0000 --- src/ex_cmds.c 2021-12-31 21:04:02.786925753 +0000 *************** *** 480,486 **** } else { ! semsg(_(e_invarg2), p); goto sortend; } } --- 480,486 ---- } else { ! semsg(_(e_invalid_argument_str), p); goto sortend; } } *************** *** 488,494 **** // Can only have one of 'n', 'b', 'o' and 'x'. if (format_found > 1) { ! emsg(_(e_invarg)); goto sortend; } --- 488,494 ---- // Can only have one of 'n', 'b', 'o' and 'x'. if (format_found > 1) { ! emsg(_(e_invalid_argument)); goto sortend; } *************** *** 664,670 **** vim_free(sortbuf2); vim_regfree(regmatch.regprog); if (got_int) ! emsg(_(e_interr)); } /* --- 664,670 ---- vim_free(sortbuf2); vim_regfree(regmatch.regprog); if (got_int) ! emsg(_(e_interrupted)); } /* *************** *** 1811,1817 **** || eap->line2 > 0 || eap->addr_count > 1)) { ! emsg(_(e_invarg)); return; } --- 1811,1817 ---- || eap->line2 > 0 || eap->addr_count > 1)) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1909,1915 **** { if (eap->cmdidx == CMD_saveas) { ! emsg(_(e_argreq)); goto theend; } other = FALSE; --- 1909,1915 ---- { if (eap->cmdidx == CMD_saveas) { ! emsg(_(e_argument_required)); goto theend; } other = FALSE; *************** *** 4776,4782 **** else if (!global_busy) { if (got_int) // interrupted ! emsg(_(e_interr)); else if (got_match) // did find something but nothing substituted msg(""); else if (subflags.do_error) // nothing found --- 4776,4782 ---- else if (!global_busy) { if (got_int) // interrupted ! emsg(_(e_interrupted)); else if (got_match) // did find something but nothing substituted msg(""); else if (subflags.do_error) // nothing found *************** *** 4845,4851 **** } if (got_int) { ! emsg(_(e_interr)); return TRUE; } return FALSE; --- 4845,4851 ---- } if (got_int) { ! emsg(_(e_interrupted)); return TRUE; } return FALSE; *************** *** 4992,4998 **** * pass 2: execute the command for each line that has been marked */ if (got_int) ! msg(_(e_interr)); else if (ndone == 0) { if (type == 'v') --- 4992,4998 ---- * pass 2: execute the command for each line that has been marked */ if (got_int) ! msg(_(e_interrupted)); else if (ndone == 0) { if (type == 'v') *** ../vim-8.2.3960/src/ex_docmd.c 2021-12-31 18:49:39.145303432 +0000 --- src/ex_docmd.c 2021-12-31 22:19:27.721185286 +0000 *************** *** 1212,1218 **** && !func_has_ended(real_cookie)))) { if (cstack.cs_flags[cstack.cs_idx] & CSF_TRY) ! emsg(_(e_endtry)); else if (cstack.cs_flags[cstack.cs_idx] & CSF_WHILE) emsg(_(e_missing_endwhile)); else if (cstack.cs_flags[cstack.cs_idx] & CSF_FOR) --- 1212,1218 ---- && !func_has_ended(real_cookie)))) { if (cstack.cs_flags[cstack.cs_idx] & CSF_TRY) ! emsg(_(e_missing_endtry)); else if (cstack.cs_flags[cstack.cs_idx] & CSF_WHILE) emsg(_(e_missing_endwhile)); else if (cstack.cs_flags[cstack.cs_idx] & CSF_FOR) *************** *** 2216,2222 **** while (ea.arg[0] == '+' && ea.arg[1] == '+') if (getargopt(&ea) == FAIL && !ni) { ! errormsg = _(e_invarg); goto doend; } --- 2216,2222 ---- while (ea.arg[0] == '+' && ea.arg[1] == '+') if (getargopt(&ea) == FAIL && !ni) { ! errormsg = _(e_invalid_argument); goto doend; } *************** *** 2400,2406 **** if (!ni && (ea.argt & EX_NEEDARG) && *ea.arg == NUL) { ! errormsg = _(e_argreq); goto doend; } --- 2400,2406 ---- if (!ni && (ea.argt & EX_NEEDARG) && *ea.arg == NUL) { ! errormsg = _(e_argument_required); goto doend; } *************** *** 5939,5945 **** tab_number = tabpage_index(lastused_tabpage); else { ! eap->errmsg = ex_errmsg(e_invargval, eap->arg); tab_number = 0; goto theend; } --- 5939,5945 ---- tab_number = tabpage_index(lastused_tabpage); else { ! eap->errmsg = ex_errmsg(e_invalid_value_for_argument_str, eap->arg); tab_number = 0; goto theend; } *************** *** 5947,5953 **** || tab_number > LAST_TAB_NR) { // No numbers as argument. ! eap->errmsg = ex_errmsg(e_invarg2, eap->arg); goto theend; } } --- 5947,5953 ---- || tab_number > LAST_TAB_NR) { // No numbers as argument. ! eap->errmsg = ex_errmsg(e_invalid_argument_str, eap->arg); goto theend; } } *************** *** 5959,5965 **** || tab_number == 0) { // No numbers as argument. ! eap->errmsg = ex_errmsg(e_invarg2, eap->arg); goto theend; } tab_number = tab_number * relative + tabpage_index(curtab); --- 5959,5965 ---- || tab_number == 0) { // No numbers as argument. ! eap->errmsg = ex_errmsg(e_invalid_argument_str, eap->arg); goto theend; } tab_number = tab_number * relative + tabpage_index(curtab); *************** *** 5967,5973 **** --tab_number; } if (tab_number < unaccept_arg0 || tab_number > LAST_TAB_NR) ! eap->errmsg = ex_errmsg(e_invarg2, eap->arg); } else if (eap->addr_count > 0) { --- 5967,5973 ---- --tab_number; } if (tab_number < unaccept_arg0 || tab_number > LAST_TAB_NR) ! eap->errmsg = ex_errmsg(e_invalid_argument_str, eap->arg); } else if (eap->addr_count > 0) { *************** *** 6678,6684 **** || tab_number == 0) { // No numbers as argument. ! eap->errmsg = ex_errmsg(e_invarg2, eap->arg); return; } } --- 6678,6684 ---- || tab_number == 0) { // No numbers as argument. ! eap->errmsg = ex_errmsg(e_invalid_argument_str, eap->arg); return; } } *************** *** 7415,7421 **** || pathcmp((char *)pdir, (char *)new_dir, -1) != 0; if (dir_differs && vim_chdir(new_dir)) { ! emsg(_(e_failed)); vim_free(pdir); } else --- 7415,7421 ---- || pathcmp((char *)pdir, (char *)new_dir, -1) != 0; if (dir_differs && vim_chdir(new_dir)) { ! emsg(_(e_command_failed)); vim_free(pdir); } else *************** *** 7541,7547 **** { case 'm': break; case NUL: len *= 1000L; break; ! default: semsg(_(e_invarg2), eap->arg); return; } // Hide the cursor if invoked with ! --- 7541,7547 ---- { case 'm': break; case NUL: len *= 1000L; break; ! default: semsg(_(e_invalid_argument_str), eap->arg); return; } // Hide the cursor if invoked with ! *************** *** 7635,7641 **** if (!isdigit(*arg)) { ! semsg(_(e_invarg2), arg); return; } w = getdigits(&arg); --- 7635,7641 ---- if (!isdigit(*arg)) { ! semsg(_(e_invalid_argument_str), arg); return; } w = getdigits(&arg); *************** *** 7659,7665 **** // CTRL-W g and CTRL-W CTRL-G have an extra command character if (eap->arg[1] == NUL) { ! emsg(_(e_invarg)); return; } xchar = eap->arg[1]; --- 7659,7665 ---- // CTRL-W g and CTRL-W CTRL-G have an extra command character if (eap->arg[1] == NUL) { ! emsg(_(e_invalid_argument)); return; } xchar = eap->arg[1]; *************** *** 7676,7682 **** #endif '"') && eap->nextcmd == NULL) ! emsg(_(e_invarg)); else if (!eap->skip) { // Pass flags on for ":vertical wincmd ]". --- 7676,7682 ---- #endif '"') && eap->nextcmd == NULL) ! emsg(_(e_invalid_argument)); else if (!eap->skip) { // Pass flags on for ":vertical wincmd ]". *************** *** 8039,8045 **** } if (*p != NUL) ! semsg(_(e_invarg2), eap->arg); else undo_time(eap->cmdidx == CMD_earlier ? -count : count, sec, file, FALSE); --- 8039,8045 ---- } if (*p != NUL) ! semsg(_(e_invalid_argument_str), eap->arg); else undo_time(eap->cmdidx == CMD_earlier ? -count : count, sec, file, FALSE); *************** *** 8135,8141 **** if (*arg != NUL) { redir_reg = 0; ! semsg(_(e_invarg2), eap->arg); } } else if (*arg == '=' && arg[1] == '>') --- 8135,8141 ---- if (*arg != NUL) { redir_reg = 0; ! semsg(_(e_invalid_argument_str), eap->arg); } } else if (*arg == '=' && arg[1] == '>') *************** *** 8162,8168 **** // TODO: redirect to a buffer else ! semsg(_(e_invarg2), eap->arg); } // Make sure redirection is not off. Can happen for cmdline completion --- 8162,8168 ---- // TODO: redirect to a buffer else ! semsg(_(e_invalid_argument_str), eap->arg); } // Make sure redirection is not off. Can happen for cmdline completion *************** *** 8326,8332 **** return; #endif if (*eap->arg == NUL) // No argument? ! emsg(_(e_argreq)); else if (eap->arg[1] != NUL) // more than one character? semsg(_(e_trailing_arg), eap->arg); else --- 8326,8332 ---- return; #endif if (*eap->arg == NUL) // No argument? ! emsg(_(e_argument_required)); else if (eap->arg[1] != NUL) // more than one character? semsg(_(e_trailing_arg), eap->arg); else *************** *** 9322,9328 **** set_option_value((char_u *)"keymodel", 0L, (char_u *)"", 0); } else ! semsg(_(e_invarg2), eap->arg); } static int filetype_detect = FALSE; --- 9322,9328 ---- set_option_value((char_u *)"keymodel", 0L, (char_u *)"", 0); } else ! semsg(_(e_invalid_argument_str), eap->arg); } static int filetype_detect = FALSE; *************** *** 9417,9423 **** } } else ! semsg(_(e_invarg2), arg); } /* --- 9417,9423 ---- } } else ! semsg(_(e_invalid_argument_str), arg); } /* *** ../vim-8.2.3960/src/ex_eval.c 2021-12-31 18:49:39.145303432 +0000 --- src/ex_eval.c 2021-12-31 21:04:18.646906921 +0000 *************** *** 191,197 **** * interrupt exception is catchable by the innermost try conditional and * not replaced by an interrupt message error exception. */ ! if (mesg == (char_u *)_(e_interr)) { *ignore = TRUE; return TRUE; --- 191,197 ---- * interrupt exception is catchable by the innermost try conditional and * not replaced by an interrupt message error exception. */ ! if (mesg == (char_u *)_(e_interrupted)) { *ignore = TRUE; return TRUE; *************** *** 1387,1398 **** if (eap->cmdidx == CMD_endwhile) { ! err = e_while; csf = CSF_WHILE; } else { ! err = e_for; csf = CSF_FOR; } --- 1387,1398 ---- if (eap->cmdidx == CMD_endwhile) { ! err = e_endwhile_without_while; csf = CSF_WHILE; } else { ! err = e_endfor_without_for; csf = CSF_FOR; } *************** *** 1415,1421 **** if (!(fl & CSF_TRY)) eap->errmsg = _(e_missing_endif); else if (fl & CSF_FINALLY) ! eap->errmsg = _(e_endtry); // Try to find the matching ":while" and report what's missing. for (idx = cstack->cs_idx; idx > 0; --idx) { --- 1415,1421 ---- if (!(fl & CSF_TRY)) eap->errmsg = _(e_missing_endif); else if (fl & CSF_FINALLY) ! eap->errmsg = _(e_missing_endtry); // Try to find the matching ":while" and report what's missing. for (idx = cstack->cs_idx; idx > 0; --idx) { *************** *** 1513,1519 **** value = eval_to_string_skip(arg, eap, eap->skip); else { ! emsg(_(e_argreq)); value = NULL; } --- 1513,1519 ---- value = eval_to_string_skip(arg, eap, eap->skip); else { ! emsg(_(e_argument_required)); value = NULL; } *************** *** 1706,1712 **** if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) { ! eap->errmsg = _(e_catch); give_up = TRUE; } else --- 1706,1712 ---- if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) { ! eap->errmsg = _(e_catch_without_try); give_up = TRUE; } else *************** *** 1802,1808 **** *end = save_char; p_cpo = save_cpo; if (regmatch.regprog == NULL) ! semsg(_(e_invarg2), pat); else { /* --- 1802,1808 ---- *end = save_char; p_cpo = save_cpo; if (regmatch.regprog == NULL) ! semsg(_(e_invalid_argument_str), pat); else { /* *************** *** 1870,1876 **** return; if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) ! eap->errmsg = _(e_finally); else { if (!(cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) --- 1870,1876 ---- return; if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) ! eap->errmsg = _(e_finally_without_try); else { if (!(cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) *************** *** 1890,1896 **** if (cstack->cs_flags[idx] & CSF_FINALLY) { // Give up for a multiple ":finally" and ignore it. ! eap->errmsg = _(e_finally_dup); return; } rewind_conditionals(cstack, idx, CSF_WHILE | CSF_FOR, --- 1890,1896 ---- if (cstack->cs_flags[idx] & CSF_FINALLY) { // Give up for a multiple ":finally" and ignore it. ! eap->errmsg = _(e_multiple_finally); return; } rewind_conditionals(cstack, idx, CSF_WHILE | CSF_FOR, *************** *** 2002,2008 **** return; if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) ! eap->errmsg = _(e_no_endtry); else { /* --- 2002,2008 ---- return; if (cstack->cs_trylevel <= 0 || cstack->cs_idx < 0) ! eap->errmsg = _(e_endtry_without_try); else { /* *** ../vim-8.2.3960/src/ex_getln.c 2021-12-31 18:49:39.145303432 +0000 --- src/ex_getln.c 2021-12-31 20:55:57.787682574 +0000 *************** *** 4200,4206 **** { n = string_to_key(p_cedit, FALSE); if (vim_isprintc(n)) ! return e_invarg; cedit_key = n; } return NULL; --- 4200,4206 ---- { n = string_to_key(p_cedit, FALSE); if (vim_isprintc(n)) ! return e_invalid_argument; cedit_key = n; } return NULL; *** ../vim-8.2.3960/src/fileio.c 2021-12-31 18:49:39.145303432 +0000 --- src/fileio.c 2021-12-31 20:51:36.372131503 +0000 *************** *** 2406,2412 **** { if (!(flags & READ_DUMMY)) { ! filemess(curbuf, sfname, (char_u *)_(e_interr), 0); if (newfile) curbuf->b_p_ro = TRUE; // must use "w!" now } --- 2406,2412 ---- { if (!(flags & READ_DUMMY)) { ! filemess(curbuf, sfname, (char_u *)_(e_interrupted), 0); if (newfile) curbuf->b_p_ro = TRUE; // must use "w!" now } *** ../vim-8.2.3960/src/filepath.c 2021-11-18 20:47:25.814140290 +0000 --- src/filepath.c 2021-12-31 21:04:21.966902949 +0000 *************** *** 842,848 **** name = tv_get_string(&argvars[0]); if (name == NULL || *name == NUL) { ! emsg(_(e_invarg)); return; } --- 842,848 ---- name = tv_get_string(&argvars[0]); if (name == NULL || *name == NUL) { ! emsg(_(e_invalid_argument)); return; } *************** *** 2267,2273 **** } else { ! semsg(_(e_invarg2), _("writefile() first argument must be a List or a Blob")); return; } --- 2267,2273 ---- } else { ! semsg(_(e_invalid_argument_str), _("writefile() first argument must be a List or a Blob")); return; } *** ../vim-8.2.3960/src/gui_gtk_x11.c 2021-11-29 20:39:06.674101624 +0000 --- src/gui_gtk_x11.c 2021-12-31 20:47:45.552521570 +0000 *************** *** 5071,5077 **** if (font == NULL) { if (report_error) ! semsg(_((char *)e_font), name); return NULL; } --- 5071,5077 ---- if (font == NULL) { if (report_error) ! semsg(_((char *)e_unknown_font_str), name); return NULL; } *** ../vim-8.2.3960/src/gui_haiku.cc 2021-10-24 20:34:01.430895189 +0100 --- src/gui_haiku.cc 2021-12-31 20:49:07.144384557 +0000 *************** *** 3847,3853 **** if (name == 0 && be_fixed_font == 0) { if (giveErrorIfMissing) ! semsg(_(e_font), name); return NOFONT; } --- 3847,3853 ---- if (name == 0 && be_fixed_font == 0) { if (giveErrorIfMissing) ! semsg(_(e_unknown_font_str), name); return NOFONT; } *************** *** 3914,3920 **** if (count_font_styles(family) <= 0) { if (giveErrorIfMissing) ! semsg(_(e_font), font->name); delete font; return NOFONT; } --- 3914,3920 ---- if (count_font_styles(family) <= 0) { if (giveErrorIfMissing) ! semsg(_(e_unknown_font_str), font->name); delete font; return NOFONT; } *** ../vim-8.2.3960/src/gui_photon.c 2021-12-27 17:21:38.008449130 +0000 --- src/gui_photon.c 2021-12-31 20:47:48.616516458 +0000 *************** *** 2955,2961 **** } if (report_error) ! semsg(e_font, vim_font_name); return FAIL; } --- 2955,2961 ---- } if (report_error) ! semsg(e_unknown_font_str, vim_font_name); return FAIL; } *** ../vim-8.2.3960/src/gui_w32.c 2021-12-27 17:21:38.008449130 +0000 --- src/gui_w32.c 2021-12-31 20:47:51.140512229 +0000 *************** *** 1547,1553 **** if (get_logfont(&lf, name, NULL, giveErrorIfMissing) == OK) font = get_font_handle(&lf); if (font == NOFONT && giveErrorIfMissing) ! semsg(_(e_font), name); return font; } --- 1547,1553 ---- if (get_logfont(&lf, name, NULL, giveErrorIfMissing) == OK) font = get_font_handle(&lf); if (font == NOFONT && giveErrorIfMissing) ! semsg(_(e_unknown_font_str), name); return font; } *** ../vim-8.2.3960/src/gui_x11.c 2021-03-29 19:10:23.152204702 +0100 --- src/gui_x11.c 2021-12-31 20:49:52.056308704 +0000 *************** *** 1887,1893 **** if (font == NULL) { if (giveErrorIfMissing) ! semsg(_(e_font), name); return NOFONT; } --- 1887,1893 ---- if (font == NULL) { if (giveErrorIfMissing) ! semsg(_(e_unknown_font_str), name); return NOFONT; } *************** *** 1911,1917 **** if (font->max_bounds.width != font->min_bounds.width) { ! semsg(_(e_fontwidth), name); XFreeFont(gui.dpy, font); return NOFONT; } --- 1911,1917 ---- if (font->max_bounds.width != font->min_bounds.width) { ! semsg(_(e_font_str_is_not_fixed_width), name); XFreeFont(gui.dpy, font); return NOFONT; } *************** *** 2072,2078 **** if (fontset == NULL) { if (giveErrorIfMissing) ! semsg(_(e_fontset), name); return NOFONTSET; } --- 2072,2078 ---- if (fontset == NULL) { if (giveErrorIfMissing) ! semsg(_(e_unknown_fontset_str), name); return NOFONTSET; } *** ../vim-8.2.3960/src/highlight.c 2021-12-07 21:29:13.934441498 +0000 --- src/highlight.c 2021-12-31 21:04:25.650898529 +0000 *************** *** 1579,1585 **** linep = vim_strchr(linep, '\''); if (linep == NULL) { ! semsg(_(e_invarg2), key_start); error = TRUE; break; } --- 1579,1585 ---- linep = vim_strchr(linep, '\''); if (linep == NULL) { ! semsg(_(e_invalid_argument_str), key_start); error = TRUE; break; } *** ../vim-8.2.3960/src/indent.c 2021-12-27 20:57:03.483387913 +0000 --- src/indent.c 2021-12-31 21:04:31.450891533 +0000 *************** *** 44,50 **** if (cp != end) emsg(_(e_positive)); else ! semsg(_(e_invarg2), cp); return FAIL; } } --- 44,50 ---- if (cp != end) emsg(_(e_positive)); else ! semsg(_(e_invalid_argument_str), cp); return FAIL; } } *************** *** 56,62 **** ++valcount; continue; } ! semsg(_(e_invarg2), var); return FAIL; } --- 56,62 ---- ++valcount; continue; } ! semsg(_(e_invalid_argument_str), var); return FAIL; } *************** *** 73,79 **** // Catch negative values, overflow and ridiculous big values. if (n < 0 || n > 9999) { ! semsg(_(e_invarg2), cp); vim_free(*array); *array = NULL; return FAIL; --- 73,79 ---- // Catch negative values, overflow and ridiculous big values. if (n < 0 || n > 9999) { ! semsg(_(e_invalid_argument_str), cp); vim_free(*array); *array = NULL; return FAIL; *************** *** 1627,1633 **** } if (new_ts < 0 || new_ts > 9999) { ! semsg(_(e_invarg2), eap->arg); return; } if (new_ts == 0) --- 1627,1633 ---- } if (new_ts < 0 || new_ts > 9999) { ! semsg(_(e_invalid_argument_str), eap->arg); return; } if (new_ts == 0) *************** *** 1736,1742 **** line_breakcheck(); } if (got_int) ! emsg(_(e_interr)); #ifdef FEAT_VARTABS // If a single value was given then it can be considered equal to --- 1736,1742 ---- line_breakcheck(); } if (got_int) ! emsg(_(e_interrupted)); #ifdef FEAT_VARTABS // If a single value was given then it can be considered equal to *************** *** 2095,2100 **** --- 2095,2103 ---- } } + /* + * Fix indent for 'lisp' and 'cindent'. + */ void fix_indent(void) { *** ../vim-8.2.3960/src/insexpand.c 2021-12-31 12:59:49.976653460 +0000 --- src/insexpand.c 2021-12-31 20:56:05.559669145 +0000 *************** *** 2746,2752 **** return; if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL) ! emsg(_(e_invarg)); else { startcol = (int)tv_get_number_chk(&argvars[0], NULL); --- 2746,2752 ---- return; if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL) ! emsg(_(e_invalid_argument)); else { startcol = (int)tv_get_number_chk(&argvars[0], NULL); *** ../vim-8.2.3960/src/job.c 2021-12-09 10:50:48.566865615 +0000 --- src/job.c 2021-12-31 22:44:02.243576080 +0000 *************** *** 33,39 **** *modep = MODE_JSON; else { ! semsg(_(e_invarg2), val); return FAIL; } return OK; --- 33,39 ---- *modep = MODE_JSON; else { ! semsg(_(e_invalid_argument_str), val); return FAIL; } return OK; *************** *** 57,63 **** opt->jo_io[part] = JIO_OUT; else { ! semsg(_(e_invarg2), val); return FAIL; } return OK; --- 57,63 ---- opt->jo_io[part] = JIO_OUT; else { ! semsg(_(e_invalid_argument_str), val); return FAIL; } return OK; *************** *** 220,226 **** opt->jo_io_buf[part] = tv_get_number(item); if (opt->jo_io_buf[part] <= 0) { ! semsg(_(e_invargNval), hi->hi_key, tv_get_string(item)); return FAIL; } if (buflist_findnr(opt->jo_io_buf[part]) == NULL) --- 220,226 ---- opt->jo_io_buf[part] = tv_get_number(item); if (opt->jo_io_buf[part] <= 0) { ! semsg(_(e_invalid_value_for_argument_str_str), hi->hi_key, tv_get_string(item)); return FAIL; } if (buflist_findnr(opt->jo_io_buf[part]) == NULL) *************** *** 270,276 **** *lp = tv_get_number(item); if (*lp < 0) { ! semsg(_(e_invargNval), hi->hi_key, tv_get_string(item)); return FAIL; } } --- 270,276 ---- *lp = tv_get_number(item); if (*lp < 0) { ! semsg(_(e_invalid_value_for_argument_str_str), hi->hi_key, tv_get_string(item)); return FAIL; } } *************** *** 281,287 **** opt->jo_set |= JO_CHANNEL; if (item->v_type != VAR_CHANNEL) { ! semsg(_(e_invargval), "channel"); return FAIL; } opt->jo_channel = item->vval.v_channel; --- 281,287 ---- opt->jo_set |= JO_CHANNEL; if (item->v_type != VAR_CHANNEL) { ! semsg(_(e_invalid_value_for_argument_str), "channel"); return FAIL; } opt->jo_channel = item->vval.v_channel; *************** *** 294,300 **** opt->jo_callback = get_callback(item); if (opt->jo_callback.cb_name == NULL) { ! semsg(_(e_invargval), "callback"); return FAIL; } } --- 294,300 ---- opt->jo_callback = get_callback(item); if (opt->jo_callback.cb_name == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "callback"); return FAIL; } } *************** *** 306,312 **** opt->jo_out_cb = get_callback(item); if (opt->jo_out_cb.cb_name == NULL) { ! semsg(_(e_invargval), "out_cb"); return FAIL; } } --- 306,312 ---- opt->jo_out_cb = get_callback(item); if (opt->jo_out_cb.cb_name == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "out_cb"); return FAIL; } } *************** *** 318,324 **** opt->jo_err_cb = get_callback(item); if (opt->jo_err_cb.cb_name == NULL) { ! semsg(_(e_invargval), "err_cb"); return FAIL; } } --- 318,324 ---- opt->jo_err_cb = get_callback(item); if (opt->jo_err_cb.cb_name == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "err_cb"); return FAIL; } } *************** *** 330,336 **** opt->jo_close_cb = get_callback(item); if (opt->jo_close_cb.cb_name == NULL) { ! semsg(_(e_invargval), "close_cb"); return FAIL; } } --- 330,336 ---- opt->jo_close_cb = get_callback(item); if (opt->jo_close_cb.cb_name == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "close_cb"); return FAIL; } } *************** *** 343,349 **** never = TRUE; else if (STRCMP(val, "auto") != 0) { ! semsg(_(e_invargNval), "drop", val); return FAIL; } opt->jo_drop_never = never; --- 343,349 ---- never = TRUE; else if (STRCMP(val, "auto") != 0) { ! semsg(_(e_invalid_value_for_argument_str_str), "drop", val); return FAIL; } opt->jo_drop_never = never; *************** *** 356,362 **** opt->jo_exit_cb = get_callback(item); if (opt->jo_exit_cb.cb_name == NULL) { ! semsg(_(e_invargval), "exit_cb"); return FAIL; } } --- 356,362 ---- opt->jo_exit_cb = get_callback(item); if (opt->jo_exit_cb.cb_name == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "exit_cb"); return FAIL; } } *************** *** 370,376 **** opt->jo_term_name_buf); if (opt->jo_term_name == NULL) { ! semsg(_(e_invargval), "term_name"); return FAIL; } } --- 370,376 ---- opt->jo_term_name_buf); if (opt->jo_term_name == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "term_name"); return FAIL; } } *************** *** 381,387 **** val = tv_get_string(item); if (STRCMP(val, "open") != 0 && STRCMP(val, "close") != 0) { ! semsg(_(e_invargNval), "term_finish", val); return FAIL; } opt->jo_set2 |= JO2_TERM_FINISH; --- 381,387 ---- val = tv_get_string(item); if (STRCMP(val, "open") != 0 && STRCMP(val, "close") != 0) { ! semsg(_(e_invalid_value_for_argument_str_str), "term_finish", val); return FAIL; } opt->jo_set2 |= JO2_TERM_FINISH; *************** *** 406,412 **** } if (p == NULL) { ! semsg(_(e_invargval), "term_opencmd"); return FAIL; } } --- 406,412 ---- } if (p == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "term_opencmd"); return FAIL; } } *************** *** 419,425 **** opt->jo_eof_chars_buf); if (opt->jo_eof_chars == NULL) { ! semsg(_(e_invargval), "eof_chars"); return FAIL; } } --- 419,425 ---- opt->jo_eof_chars_buf); if (opt->jo_eof_chars == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "eof_chars"); return FAIL; } } *************** *** 435,441 **** return FAIL; if (opt->jo_term_rows < 0 || opt->jo_term_rows > 1000) { ! semsg(_(e_invargval), "term_rows"); return FAIL; } } --- 435,441 ---- return FAIL; if (opt->jo_term_rows < 0 || opt->jo_term_rows > 1000) { ! semsg(_(e_invalid_value_for_argument_str), "term_rows"); return FAIL; } } *************** *** 470,476 **** nr = tv_get_number(item); if (nr <= 0) { ! semsg(_(e_invargNval), hi->hi_key, tv_get_string(item)); return FAIL; } opt->jo_bufnr_buf = buflist_findnr(nr); --- 470,476 ---- nr = tv_get_number(item); if (nr <= 0) { ! semsg(_(e_invalid_value_for_argument_str_str), hi->hi_key, tv_get_string(item)); return FAIL; } opt->jo_bufnr_buf = buflist_findnr(nr); *************** *** 482,488 **** if (opt->jo_bufnr_buf->b_nwindows == 0 || opt->jo_bufnr_buf->b_term == NULL) { ! semsg(_(e_invarg2), "bufnr"); return FAIL; } } --- 482,488 ---- if (opt->jo_bufnr_buf->b_nwindows == 0 || opt->jo_bufnr_buf->b_term == NULL) { ! semsg(_(e_invalid_argument_str), "bufnr"); return FAIL; } } *************** *** 509,515 **** opt->jo_term_kill_buf); if (opt->jo_term_kill == NULL) { ! semsg(_(e_invargval), "term_kill"); return FAIL; } } --- 509,515 ---- opt->jo_term_kill_buf); if (opt->jo_term_kill == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "term_kill"); return FAIL; } } *************** *** 523,536 **** p = tv_get_string_chk(item); if (p == NULL) { ! semsg(_(e_invargval), "tty_type"); return FAIL; } // Allow empty string, "winpty", "conpty". if (!(*p == NUL || STRCMP(p, "winpty") == 0 || STRCMP(p, "conpty") == 0)) { ! semsg(_(e_invargval), "tty_type"); return FAIL; } opt->jo_tty_type = p[0]; --- 523,536 ---- p = tv_get_string_chk(item); if (p == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "tty_type"); return FAIL; } // Allow empty string, "winpty", "conpty". if (!(*p == NUL || STRCMP(p, "winpty") == 0 || STRCMP(p, "conpty") == 0)) { ! semsg(_(e_invalid_value_for_argument_str), "tty_type"); return FAIL; } opt->jo_tty_type = p[0]; *************** *** 548,554 **** if (item == NULL || item->v_type != VAR_LIST || item->vval.v_list == NULL) { ! semsg(_(e_invargval), "ansi_colors"); return FAIL; } --- 548,554 ---- if (item == NULL || item->v_type != VAR_LIST || item->vval.v_list == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "ansi_colors"); return FAIL; } *************** *** 578,584 **** if (n != 16 || li != NULL) { ! semsg(_(e_invargval), "ansi_colors"); return FAIL; } --- 578,584 ---- if (n != 16 || li != NULL) { ! semsg(_(e_invalid_value_for_argument_str), "ansi_colors"); return FAIL; } *************** *** 596,602 **** p = tv_get_string_buf_chk(item, opt->jo_term_highlight_buf); if (p == NULL || *p == NUL) { ! semsg(_(e_invargval), "term_highlight"); return FAIL; } opt->jo_term_highlight = p; --- 596,602 ---- p = tv_get_string_buf_chk(item, opt->jo_term_highlight_buf); if (p == NULL || *p == NUL) { ! semsg(_(e_invalid_value_for_argument_str), "term_highlight"); return FAIL; } opt->jo_term_highlight = p; *************** *** 610,616 **** opt->jo_term_api_buf); if (opt->jo_term_api == NULL) { ! semsg(_(e_invargval), "term_api"); return FAIL; } } --- 610,616 ---- opt->jo_term_api_buf); if (opt->jo_term_api == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "term_api"); return FAIL; } } *************** *** 621,627 **** break; if (item->v_type != VAR_DICT) { ! semsg(_(e_invargval), "env"); return FAIL; } opt->jo_set2 |= JO2_ENV; --- 621,627 ---- break; if (item->v_type != VAR_DICT) { ! semsg(_(e_invalid_value_for_argument_str), "env"); return FAIL; } opt->jo_set2 |= JO2_ENV; *************** *** 640,646 **** #endif ) { ! semsg(_(e_invargval), "cwd"); return FAIL; } opt->jo_set2 |= JO2_CWD; --- 640,646 ---- #endif ) { ! semsg(_(e_invalid_value_for_argument_str), "cwd"); return FAIL; } opt->jo_set2 |= JO2_CWD; *************** *** 685,691 **** opt->jo_part = PART_OUT; else { ! semsg(_(e_invargNval), "part", val); return FAIL; } } --- 685,691 ---- opt->jo_part = PART_OUT; else { ! semsg(_(e_invalid_value_for_argument_str_str), "part", val); return FAIL; } } *************** *** 705,711 **** opt->jo_stoponexit_buf); if (opt->jo_stoponexit == NULL) { ! semsg(_(e_invargval), "stoponexit"); return FAIL; } } --- 705,711 ---- opt->jo_stoponexit_buf); if (opt->jo_stoponexit == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "stoponexit"); return FAIL; } } *************** *** 722,728 **** } if (todo > 0) { ! semsg(_(e_invarg2), hi->hi_key); return FAIL; } --- 722,728 ---- } if (todo > 0) { ! semsg(_(e_invalid_argument_str), hi->hi_key); return FAIL; } *************** *** 1385,1391 **** cmd = argvars[0].vval.v_string; if (cmd == NULL || *skipwhite(cmd) == NUL) { ! emsg(_(e_invarg)); goto theend; } --- 1385,1391 ---- cmd = argvars[0].vval.v_string; if (cmd == NULL || *skipwhite(cmd) == NUL) { ! emsg(_(e_invalid_argument)); goto theend; } *************** *** 1396,1402 **** || argvars[0].vval.v_list == NULL || argvars[0].vval.v_list->lv_len < 1) { ! emsg(_(e_invarg)); goto theend; } else --- 1396,1402 ---- || argvars[0].vval.v_list == NULL || argvars[0].vval.v_list->lv_len < 1) { ! emsg(_(e_invalid_argument)); goto theend; } else *************** *** 1409,1415 **** // Empty command is invalid. if (argc == 0 || *skipwhite((char_u *)argv[0]) == NUL) { ! emsg(_(e_invarg)); goto theend; } #ifndef USE_ARGV --- 1409,1415 ---- // Empty command is invalid. if (argc == 0 || *skipwhite((char_u *)argv[0]) == NUL) { ! emsg(_(e_invalid_argument)); goto theend; } #ifndef USE_ARGV *************** *** 1418,1424 **** cmd = ga.ga_data; if (cmd == NULL || *skipwhite(cmd) == NUL) { ! emsg(_(e_invarg)); goto theend; } #endif --- 1418,1424 ---- cmd = ga.ga_data; if (cmd == NULL || *skipwhite(cmd) == NUL) { ! emsg(_(e_invalid_argument)); goto theend; } #endif *************** *** 1512,1518 **** arg = tv_get_string_chk(&argvars[1]); if (arg == NULL) { ! emsg(_(e_invarg)); return 0; } } --- 1512,1518 ---- arg = tv_get_string_chk(&argvars[1]); if (arg == NULL) { ! emsg(_(e_invalid_argument)); return 0; } } *************** *** 1775,1781 **** if (tv->v_type != VAR_JOB) { ! semsg(_(e_invarg2), tv_get_string(tv)); return NULL; } job = tv->vval.v_job; --- 1775,1781 ---- if (tv->v_type != VAR_JOB) { ! semsg(_(e_invalid_argument_str), tv_get_string(tv)); return NULL; } job = tv->vval.v_job; *** ../vim-8.2.3960/src/json.c 2021-08-08 14:43:30.109238223 +0100 --- src/json.c 2021-12-31 20:56:17.995647648 +0000 *************** *** 933,939 **** top_item->jd_key = tv_get_string_buf_chk(cur_item, key_buf); if (top_item->jd_key == NULL) { ! emsg(_(e_invarg)); retval = FAIL; goto theend; } --- 933,939 ---- top_item->jd_key = tv_get_string_buf_chk(cur_item, key_buf); if (top_item->jd_key == NULL) { ! emsg(_(e_invalid_argument)); retval = FAIL; goto theend; } *************** *** 1164,1170 **** reader.js_fill = NULL; reader.js_used = 0; if (json_decode_all(&reader, rettv, JSON_JS) != OK) ! emsg(_(e_invarg)); } /* --- 1164,1170 ---- reader.js_fill = NULL; reader.js_used = 0; if (json_decode_all(&reader, rettv, JSON_JS) != OK) ! emsg(_(e_invalid_argument)); } /* *** ../vim-8.2.3960/src/list.c 2021-12-27 11:54:30.709518535 +0000 --- src/list.c 2021-12-31 20:56:22.279640235 +0000 *************** *** 1658,1664 **** if (argvars[0].v_type != VAR_LIST) { ! emsg(_(e_invarg)); return; } --- 1658,1664 ---- if (argvars[0].v_type != VAR_LIST) { ! emsg(_(e_invalid_argument)); return; } *************** *** 2128,2134 **** info->item_compare_func = tv_get_string(&argvars[1]); else if (nr != 0) { ! emsg(_(e_invarg)); return FAIL; } } --- 2128,2134 ---- info->item_compare_func = tv_get_string(&argvars[1]); else if (nr != 0) { ! emsg(_(e_invalid_argument)); return FAIL; } } *************** *** 2670,2676 **** { if (argvars[2].v_type != VAR_UNKNOWN && argvars[3].v_type != VAR_UNKNOWN) ! emsg(_(e_invarg)); else n = dict_count(argvars[0].vval.v_dict, &argvars[1], ic); } --- 2670,2676 ---- { if (argvars[2].v_type != VAR_UNKNOWN && argvars[3].v_type != VAR_UNKNOWN) ! emsg(_(e_invalid_argument)); else n = dict_count(argvars[0].vval.v_dict, &argvars[1], ic); } *** ../vim-8.2.3960/src/map.c 2021-12-31 18:49:39.149303426 +0000 --- src/map.c 2021-12-31 20:56:26.111633606 +0000 *************** *** 916,922 **** local = (STRCMP(arg, "") == 0); if (!local && *arg != NUL) { ! emsg(_(e_invarg)); return; } --- 916,922 ---- local = (STRCMP(arg, "") == 0); if (!local && *arg != NUL) { ! emsg(_(e_invalid_argument)); return; } *************** *** 2753,2759 **** switch (do_map((*cmdp == 'n') ? 2 : (*cmdp == 'u'), eap->arg, mode, isabbrev)) { ! case 1: emsg(_(e_invarg)); break; case 2: emsg((isabbrev ? _(e_no_such_abbreviation) : _(e_no_such_mapping))); --- 2753,2759 ---- switch (do_map((*cmdp == 'n') ? 2 : (*cmdp == 'u'), eap->arg, mode, isabbrev)) { ! case 1: emsg(_(e_invalid_argument)); break; case 2: emsg((isabbrev ? _(e_no_such_abbreviation) : _(e_no_such_mapping))); *** ../vim-8.2.3960/src/mark.c 2021-12-13 13:11:00.692262343 +0000 --- src/mark.c 2021-12-31 21:04:42.902877661 +0000 *************** *** 787,795 **** // clear all marks clrallmarks(curbuf); else if (eap->forceit) ! emsg(_(e_invarg)); else if (*eap->arg == NUL) ! emsg(_(e_argreq)); else { // clear specified marks only --- 787,795 ---- // clear all marks clrallmarks(curbuf); else if (eap->forceit) ! emsg(_(e_invalid_argument)); else if (*eap->arg == NUL) ! emsg(_(e_argument_required)); else { // clear specified marks only *************** *** 809,815 **** : ASCII_ISUPPER(p[2]))) || to < from) { ! semsg(_(e_invarg2), p); return; } p += 2; --- 809,815 ---- : ASCII_ISUPPER(p[2]))) || to < from) { ! semsg(_(e_invalid_argument_str), p); return; } p += 2; *************** *** 848,854 **** case '<': curbuf->b_visual.vi_start.lnum = 0; break; case '>': curbuf->b_visual.vi_end.lnum = 0; break; case ' ': break; ! default: semsg(_(e_invarg2), p); return; } } --- 848,854 ---- case '<': curbuf->b_visual.vi_start.lnum = 0; break; case '>': curbuf->b_visual.vi_end.lnum = 0; break; case ' ': break; ! default: semsg(_(e_invalid_argument_str), p); return; } } *** ../vim-8.2.3960/src/match.c 2021-12-29 19:22:19.132139692 +0000 --- src/match.c 2021-12-31 21:04:47.778871726 +0000 *************** *** 69,75 **** } if (pat != NULL && (regprog = vim_regcomp(pat, RE_MAGIC)) == NULL) { ! semsg(_(e_invarg2), pat); return -1; } --- 69,75 ---- } if (pat != NULL && (regprog = vim_regcomp(pat, RE_MAGIC)) == NULL) { ! semsg(_(e_invalid_argument_str), pat); return -1; } *************** *** 1087,1093 **** if (li->li_tv.v_type != VAR_DICT || (d = li->li_tv.vval.v_dict) == NULL) { ! emsg(_(e_invarg)); return; } if (!(dict_find(d, (char_u *)"group", -1) != NULL --- 1087,1093 ---- if (li->li_tv.v_type != VAR_DICT || (d = li->li_tv.vval.v_dict) == NULL) { ! emsg(_(e_invalid_argument)); return; } if (!(dict_find(d, (char_u *)"group", -1) != NULL *************** *** 1096,1102 **** && dict_find(d, (char_u *)"priority", -1) != NULL && dict_find(d, (char_u *)"id", -1) != NULL)) { ! emsg(_(e_invarg)); return; } li = li->li_next; --- 1096,1102 ---- && dict_find(d, (char_u *)"priority", -1) != NULL && dict_find(d, (char_u *)"id", -1) != NULL)) { ! emsg(_(e_invalid_argument)); return; } li = li->li_next; *************** *** 1394,1400 **** { // There must be two arguments. vim_free(g); ! semsg(_(e_invarg2), eap->arg); return; } end = skip_regexp(p + 1, *p, TRUE); --- 1394,1400 ---- { // There must be two arguments. vim_free(g); ! semsg(_(e_invalid_argument_str), eap->arg); return; } end = skip_regexp(p + 1, *p, TRUE); *************** *** 1409,1415 **** if (*end != *p) { vim_free(g); ! semsg(_(e_invarg2), p); return; } --- 1409,1415 ---- if (*end != *p) { vim_free(g); ! semsg(_(e_invalid_argument_str), p); return; } *** ../vim-8.2.3960/src/mbyte.c 2021-12-16 14:45:09.361563197 +0000 --- src/mbyte.c 2021-12-31 20:56:36.443615741 +0000 *************** *** 530,536 **** // Windows: accept only valid codepage numbers, check below. if (p_enc[6] != 'c' || p_enc[7] != 'p' || (enc_dbcs_new = atoi((char *)p_enc + 8)) == 0) ! return e_invarg; #else // Unix: accept any "2byte-" name, assume current locale. enc_dbcs_new = DBCS_2BYTE; --- 530,536 ---- // Windows: accept only valid codepage numbers, check below. if (p_enc[6] != 'c' || p_enc[7] != 'p' || (enc_dbcs_new = atoi((char *)p_enc + 8)) == 0) ! return e_invalid_argument; #else // Unix: accept any "2byte-" name, assume current locale. enc_dbcs_new = DBCS_2BYTE; *************** *** 563,569 **** } } else // Don't know what encoding this is, reject it. ! return e_invarg; if (enc_dbcs_new != 0) { --- 563,569 ---- } } else // Don't know what encoding this is, reject it. ! return e_invalid_argument; if (enc_dbcs_new != 0) { *** ../vim-8.2.3960/src/menu.c 2021-12-27 17:21:38.012449123 +0000 --- src/menu.c 2021-12-31 21:04:51.874866729 +0000 *************** *** 273,279 **** menu_path = arg; if (*menu_path == '.') { ! semsg(_(e_invarg2), menu_path); goto theend; } --- 273,279 ---- menu_path = arg; if (*menu_path == '.') { ! semsg(_(e_invalid_argument_str), menu_path); goto theend; } *************** *** 2508,2514 **** case 't': mode_idx = MENU_INDEX_TERMINAL; break; case 'i': mode_idx = MENU_INDEX_INSERT; break; case 'c': mode_idx = MENU_INDEX_CMDLINE; break; ! default: semsg(_(e_invarg2), arg); return; } arg = skipwhite(arg + 2); --- 2508,2514 ---- case 't': mode_idx = MENU_INDEX_TERMINAL; break; case 'i': mode_idx = MENU_INDEX_INSERT; break; case 'c': mode_idx = MENU_INDEX_CMDLINE; break; ! default: semsg(_(e_invalid_argument_str), arg); return; } arg = skipwhite(arg + 2); *************** *** 2698,2704 **** if (arg == to || ends_excmd2(eap->arg, from) || ends_excmd2(eap->arg, to) || !ends_excmd2(eap->arg, skipwhite(arg))) ! emsg(_(e_invarg)); else { if (ga_grow(&menutrans_ga, 1) == OK) --- 2698,2704 ---- if (arg == to || ends_excmd2(eap->arg, from) || ends_excmd2(eap->arg, to) || !ends_excmd2(eap->arg, skipwhite(arg))) ! emsg(_(e_invalid_argument)); else { if (ga_grow(&menutrans_ga, 1) == OK) *** ../vim-8.2.3960/src/message.c 2021-12-30 13:32:05.687843894 +0000 --- src/message.c 2021-12-31 20:56:42.839604675 +0000 *************** *** 1051,1057 **** if (*eap->arg != NUL) { ! emsg(_(e_invarg)); return; } --- 1051,1057 ---- if (*eap->arg != NUL) { ! emsg(_(e_invalid_argument)); return; } *** ../vim-8.2.3960/src/misc2.c 2021-12-16 20:56:52.952098567 +0000 --- src/misc2.c 2021-12-31 20:56:47.315596926 +0000 *************** *** 1375,1381 **** vim_str2nr(bp + 5, NULL, &l, STR2NR_ALL, NULL, NULL, 0, TRUE); if (l == 0) { ! emsg(_(e_invarg)); return 0; } bp += l + 5; --- 1375,1381 ---- vim_str2nr(bp + 5, NULL, &l, STR2NR_ALL, NULL, NULL, 0, TRUE); if (l == 0) { ! emsg(_(e_invalid_argument)); return 0; } bp += l + 5; *************** *** 1413,1419 **** &n, 0, TRUE); if (l == 0) { ! emsg(_(e_invarg)); return 0; } key = (int)n; --- 1413,1419 ---- &n, 0, TRUE); if (l == 0) { ! emsg(_(e_invalid_argument)); return 0; } key = (int)n; *** ../vim-8.2.3960/src/ops.c 2021-12-15 21:08:46.094889851 +0000 --- src/ops.c 2021-12-31 20:37:11.657528508 +0000 *************** *** 745,751 **** msg_silent = msg_silent_save; if (n != 'y') { ! emsg(_(e_abort)); return FAIL; } } --- 745,751 ---- msg_silent = msg_silent_save; if (n != 'y') { ! emsg(_(e_command_aborted)); return FAIL; } } *** ../vim-8.2.3960/src/option.c 2021-12-28 20:53:27.208143390 +0000 --- src/option.c 2021-12-31 20:56:59.639575581 +0000 *************** *** 1325,1331 **** } if (arg[len] != '>') { ! errmsg = e_invarg; goto skip; } arg[len] = NUL; // put NUL after name --- 1325,1331 ---- } if (arg[len] != '>') { ! errmsg = e_invalid_argument; goto skip; } arg[len] = NUL; // put NUL after name *************** *** 1577,1583 **** { if (nextchar == '=' || nextchar == ':') { ! errmsg = e_invarg; goto skip; } --- 1577,1583 ---- { if (nextchar == '=' || nextchar == ':') { ! errmsg = e_invalid_argument; goto skip; } *************** *** 1627,1633 **** if (vim_strchr((char_u *)"=:&<", nextchar) == NULL || prefix != 1) { ! errmsg = e_invarg; goto skip; } --- 1627,1633 ---- if (vim_strchr((char_u *)"=:&<", nextchar) == NULL || prefix != 1) { ! errmsg = e_invalid_argument; goto skip; } *************** *** 1669,1675 **** value = string_to_key(arg, FALSE); if (value == 0 && (long *)varp != &p_wcm) { ! errmsg = e_invarg; goto skip; } } --- 1669,1675 ---- value = string_to_key(arg, FALSE); if (value == 0 && (long *)varp != &p_wcm) { ! errmsg = e_invalid_argument; goto skip; } } *************** *** 3471,3477 **** } else if (curwin->w_p_fdc > 12) { ! errmsg = e_invarg; curwin->w_p_fdc = 12; } } --- 3471,3477 ---- } else if (curwin->w_p_fdc > 12) { ! errmsg = e_invalid_argument; curwin->w_p_fdc = 12; } } *************** *** 3508,3514 **** { if (curbuf->b_p_iminsert < 0 || curbuf->b_p_iminsert > B_IMODE_LAST) { ! errmsg = e_invarg; curbuf->b_p_iminsert = B_IMODE_NONE; } p_iminsert = curbuf->b_p_iminsert; --- 3508,3514 ---- { if (curbuf->b_p_iminsert < 0 || curbuf->b_p_iminsert > B_IMODE_LAST) { ! errmsg = e_invalid_argument; curbuf->b_p_iminsert = B_IMODE_NONE; } p_iminsert = curbuf->b_p_iminsert; *************** *** 3525,3531 **** else if (pp == &p_imst) { if (p_imst != IM_ON_THE_SPOT && p_imst != IM_OVER_THE_SPOT) ! errmsg = e_invarg; } #endif --- 3525,3531 ---- else if (pp == &p_imst) { if (p_imst != IM_ON_THE_SPOT && p_imst != IM_OVER_THE_SPOT) ! errmsg = e_invalid_argument; } #endif *************** *** 3541,3547 **** { if (curbuf->b_p_imsearch < -1 || curbuf->b_p_imsearch > B_IMODE_LAST) { ! errmsg = e_invarg; curbuf->b_p_imsearch = B_IMODE_NONE; } p_imsearch = curbuf->b_p_imsearch; --- 3541,3547 ---- { if (curbuf->b_p_imsearch < -1 || curbuf->b_p_imsearch > B_IMODE_LAST) { ! errmsg = e_invalid_argument; curbuf->b_p_imsearch = B_IMODE_NONE; } p_imsearch = curbuf->b_p_imsearch; *************** *** 3601,3607 **** } else if (curwin->w_p_cole > 3) { ! errmsg = e_invarg; curwin->w_p_cole = 3; } } --- 3601,3607 ---- } else if (curwin->w_p_cole > 3) { ! errmsg = e_invalid_argument; curwin->w_p_cole = 3; } } *************** *** 3616,3622 **** else if (pp == &p_pyx) { if (p_pyx != 0 && p_pyx != 2 && p_pyx != 3) ! errmsg = e_invarg; } #endif --- 3616,3622 ---- else if (pp == &p_pyx) { if (p_pyx != 0 && p_pyx != 2 && p_pyx != 3) ! errmsg = e_invalid_argument; } #endif *************** *** 3647,3653 **** } if (curwin->w_p_nuw > 20) { ! errmsg = e_invarg; curwin->w_p_nuw = 20; } curwin->w_nrwidth_line_count = 0; // trigger a redraw --- 3647,3653 ---- } if (curwin->w_p_nuw > 20) { ! errmsg = e_invalid_argument; curwin->w_p_nuw = 20; } curwin->w_nrwidth_line_count = 0; // trigger a redraw *************** *** 3759,3770 **** } else if (p_hi > 10000) { ! errmsg = e_invarg; p_hi = 10000; } if (p_re < 0 || p_re > 2) { ! errmsg = e_invarg; p_re = 0; } if (p_report < 0) --- 3759,3770 ---- } else if (p_hi > 10000) { ! errmsg = e_invalid_argument; p_hi = 10000; } if (p_re < 0 || p_re > 2) { ! errmsg = e_invalid_argument; p_re = 0; } if (p_report < 0) *** ../vim-8.2.3960/src/optionstr.c 2021-12-26 21:54:38.124433099 +0000 --- src/optionstr.c 2021-12-31 20:57:51.967484873 +0000 *************** *** 687,693 **** ? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL) || ((get_option_flags(opt_idx) & P_NDNAME) && vim_strpbrk(*varp, (char_u *)"*?[|;&<>\r\n") != NULL)) ! errmsg = e_invarg; // 'term' else if (varp == &T_NAME) --- 687,693 ---- ? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL) || ((get_option_flags(opt_idx) & P_NDNAME) && vim_strpbrk(*varp, (char_u *)"*?[|;&<>\r\n") != NULL)) ! errmsg = e_invalid_argument; // 'term' else if (varp == &T_NAME) *************** *** 732,745 **** else { if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK) ! errmsg = e_invarg; if ((((int)*flags & BKC_AUTO) != 0) + (((int)*flags & BKC_YES) != 0) + (((int)*flags & BKC_NO) != 0) != 1) { // Must have exactly one of "auto", "yes" and "no". (void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE); ! errmsg = e_invarg; } } } --- 732,745 ---- else { if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK) ! errmsg = e_invalid_argument; if ((((int)*flags & BKC_AUTO) != 0) + (((int)*flags & BKC_YES) != 0) + (((int)*flags & BKC_NO) != 0) != 1) { // Must have exactly one of "auto", "yes" and "no". (void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE); ! errmsg = e_invalid_argument; } } } *************** *** 756,762 **** else if (varp == &curwin->w_p_briopt) { if (briopt_check(curwin) == FAIL) ! errmsg = e_invarg; } #endif --- 756,762 ---- else if (varp == &curwin->w_p_briopt) { if (briopt_check(curwin) == FAIL) ! errmsg = e_invalid_argument; } #endif *************** *** 771,777 **** if (init_chartab() == FAIL) { did_chartab = TRUE; // need to restore it below ! errmsg = e_invarg; // error in value } } --- 771,777 ---- if (init_chartab() == FAIL) { did_chartab = TRUE; // need to restore it below ! errmsg = e_invalid_argument; // error in value } } *************** *** 797,803 **** || gvarp == &curwin->w_allbuf_opt.wo_culopt) { if (**varp == NUL || fill_culopt_flags(*varp, curwin) != OK) ! errmsg = e_invarg; } // 'colorcolumn' --- 797,803 ---- || gvarp == &curwin->w_allbuf_opt.wo_culopt) { if (**varp == NUL || fill_culopt_flags(*varp, curwin) != OK) ! errmsg = e_invalid_argument; } // 'colorcolumn' *************** *** 814,820 **** { if (s[1] == NUL || ((s[2] != ',' || s[3] == NUL) && s[2] != NUL)) { ! errmsg = e_invarg; break; } if (s[2] == NUL) --- 814,820 ---- { if (s[1] == NUL || ((s[2] != ',' || s[3] == NUL) && s[2] != NUL)) { ! errmsg = e_invalid_argument; break; } if (s[2] == NUL) *************** *** 827,840 **** else if (varp == &p_hl) { if (highlight_changed() == FAIL) ! errmsg = e_invarg; // invalid flags } // 'nrformats' else if (gvarp == &p_nf) { if (check_opt_strings(*varp, p_nf_values, TRUE) != OK) ! errmsg = e_invarg; } #ifdef FEAT_SESSION --- 827,840 ---- else if (varp == &p_hl) { if (highlight_changed() == FAIL) ! errmsg = e_invalid_argument; // invalid flags } // 'nrformats' else if (gvarp == &p_nf) { if (check_opt_strings(*varp, p_nf_values, TRUE) != OK) ! errmsg = e_invalid_argument; } #ifdef FEAT_SESSION *************** *** 842,860 **** else if (varp == &p_ssop) { if (opt_strings_flags(p_ssop, p_ssop_values, &ssop_flags, TRUE) != OK) ! errmsg = e_invarg; if ((ssop_flags & SSOP_CURDIR) && (ssop_flags & SSOP_SESDIR)) { // Don't allow both "sesdir" and "curdir". (void)opt_strings_flags(oldval, p_ssop_values, &ssop_flags, TRUE); ! errmsg = e_invarg; } } // 'viewoptions' else if (varp == &p_vop) { if (opt_strings_flags(p_vop, p_ssop_values, &vop_flags, TRUE) != OK) ! errmsg = e_invarg; } #endif --- 842,860 ---- else if (varp == &p_ssop) { if (opt_strings_flags(p_ssop, p_ssop_values, &ssop_flags, TRUE) != OK) ! errmsg = e_invalid_argument; if ((ssop_flags & SSOP_CURDIR) && (ssop_flags & SSOP_SESDIR)) { // Don't allow both "sesdir" and "curdir". (void)opt_strings_flags(oldval, p_ssop_values, &ssop_flags, TRUE); ! errmsg = e_invalid_argument; } } // 'viewoptions' else if (varp == &p_vop) { if (opt_strings_flags(p_vop, p_ssop_values, &vop_flags, TRUE) != OK) ! errmsg = e_invalid_argument; } #endif *************** *** 862,875 **** else if (varp == &p_sbo) { if (check_opt_strings(p_sbo, p_scbopt_values, TRUE) != OK) ! errmsg = e_invarg; } // 'ambiwidth' else if (varp == &p_ambw || varp == &p_emoji) { if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK) ! errmsg = e_invarg; else if (set_chars_option(curwin, &p_fcs) != NULL) errmsg = _(e_conflicts_with_value_of_fillchars); else --- 862,875 ---- else if (varp == &p_sbo) { if (check_opt_strings(p_sbo, p_scbopt_values, TRUE) != OK) ! errmsg = e_invalid_argument; } // 'ambiwidth' else if (varp == &p_ambw || varp == &p_emoji) { if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK) ! errmsg = e_invalid_argument; else if (set_chars_option(curwin, &p_fcs) != NULL) errmsg = _(e_conflicts_with_value_of_fillchars); else *************** *** 920,940 **** #endif } else ! errmsg = e_invarg; } // 'wildmode' else if (varp == &p_wim) { if (check_opt_wim() == FAIL) ! errmsg = e_invarg; } // 'wildoptions' else if (varp == &p_wop) { if (check_opt_strings(p_wop, p_wop_values, TRUE) != OK) ! errmsg = e_invarg; } #ifdef FEAT_WAK --- 920,940 ---- #endif } else ! errmsg = e_invalid_argument; } // 'wildmode' else if (varp == &p_wim) { if (check_opt_wim() == FAIL) ! errmsg = e_invalid_argument; } // 'wildoptions' else if (varp == &p_wop) { if (check_opt_strings(p_wop, p_wop_values, TRUE) != OK) ! errmsg = e_invalid_argument; } #ifdef FEAT_WAK *************** *** 943,949 **** { if (*p_wak == NUL || check_opt_strings(p_wak, p_wak_values, FALSE) != OK) ! errmsg = e_invarg; # ifdef FEAT_MENU # ifdef FEAT_GUI_MOTIF else if (gui.in_use) --- 943,949 ---- { if (*p_wak == NUL || check_opt_strings(p_wak, p_wak_values, FALSE) != OK) ! errmsg = e_invalid_argument; # ifdef FEAT_MENU # ifdef FEAT_GUI_MOTIF else if (gui.in_use) *************** *** 962,968 **** else if (varp == &p_ei) { if (check_ei() == FAIL) ! errmsg = e_invarg; } // 'encoding', 'fileencoding', 'termencoding' and 'makeencoding' --- 962,968 ---- else if (varp == &p_ei) { if (check_ei() == FAIL) ! errmsg = e_invalid_argument; } // 'encoding', 'fileencoding', 'termencoding' and 'makeencoding' *************** *** 976,982 **** else if (vim_strchr(*varp, ',') != NULL) // No comma allowed in 'fileencoding'; catches confusing it // with 'fileencodings'. ! errmsg = e_invarg; else { // May show a "+" in the title now. --- 976,982 ---- else if (vim_strchr(*varp, ',') != NULL) // No comma allowed in 'fileencoding'; catches confusing it // with 'fileencodings'. ! errmsg = e_invalid_argument; else { // May show a "+" in the title now. *************** *** 1029,1035 **** { semsg(_("E950: Cannot convert between %s and %s"), p_tenc, p_enc); ! errmsg = e_invarg; } } --- 1029,1035 ---- { semsg(_("E950: Cannot convert between %s and %s"), p_tenc, p_enc); ! errmsg = e_invalid_argument; } } *************** *** 1069,1075 **** else if (varp == &p_imak) { if (!im_xim_isvalid_imactivate()) ! errmsg = e_invarg; } #endif --- 1069,1075 ---- else if (varp == &p_imak) { if (!im_xim_isvalid_imactivate()) ! errmsg = e_invalid_argument; } #endif *************** *** 1077,1083 **** else if (varp == &curbuf->b_p_keymap) { if (!valid_filetype(*varp)) ! errmsg = e_invarg; else { int secure_save = secure; --- 1077,1083 ---- else if (varp == &curbuf->b_p_keymap) { if (!valid_filetype(*varp)) ! errmsg = e_invalid_argument; else { int secure_save = secure; *************** *** 1129,1135 **** if (!curbuf->b_p_ma && !(opt_flags & OPT_GLOBAL)) errmsg = e_cannot_make_changes_modifiable_is_off; else if (check_opt_strings(*varp, p_ff_values, FALSE) != OK) ! errmsg = e_invarg; else { // may also change 'textmode' --- 1129,1135 ---- if (!curbuf->b_p_ma && !(opt_flags & OPT_GLOBAL)) errmsg = e_cannot_make_changes_modifiable_is_off; else if (check_opt_strings(*varp, p_ff_values, FALSE) != OK) ! errmsg = e_invalid_argument; else { // may also change 'textmode' *************** *** 1151,1157 **** else if (varp == &p_ffs) { if (check_opt_strings(p_ffs, p_ff_values, TRUE) != OK) ! errmsg = e_invarg; else { // also change 'textauto' --- 1151,1157 ---- else if (varp == &p_ffs) { if (check_opt_strings(p_ffs, p_ff_values, TRUE) != OK) ! errmsg = e_invalid_argument; else { // also change 'textauto' *************** *** 1186,1194 **** else p = p_cm; if (check_opt_strings(p, p_cm_values, TRUE) != OK) ! errmsg = e_invarg; else if (crypt_self_test() == FAIL) ! errmsg = e_invarg; else { // When setting the global value to empty, make it "zip". --- 1186,1194 ---- else p = p_cm; if (check_opt_strings(p, p_cm_values, TRUE) != OK) ! errmsg = e_invalid_argument; else if (crypt_self_test() == FAIL) ! errmsg = e_invalid_argument; else { // When setting the global value to empty, make it "zip". *************** *** 1257,1263 **** } if (x2 != ':' || x3 == -1 || (*p != NUL && *p != ',')) { ! errmsg = e_invarg; break; } if (*p == NUL) --- 1257,1263 ---- } if (x2 != ':' || x3 == -1 || (*p != NUL && *p != ',')) { ! errmsg = e_invalid_argument; break; } if (*p == NUL) *************** *** 1271,1277 **** { if (p[1] != ':' || p[2] == NUL || (p[3] != NUL && p[3] != ',')) { ! errmsg = e_invarg; break; } if (p[3] == NUL) --- 1271,1277 ---- { if (p[1] != ':' || p[2] == NUL || (p[3] != NUL && p[3] != ',')) { ! errmsg = e_invalid_argument; break; } if (p[3] == NUL) *************** *** 1356,1362 **** { verbose_stop(); if (*p_vfile != NUL && verbose_open() == FAIL) ! errmsg = e_invarg; } #ifdef FEAT_VIMINFO --- 1356,1362 ---- { verbose_stop(); if (*p_vfile != NUL && verbose_open() == FAIL) ! errmsg = e_invalid_argument; } #ifdef FEAT_VIMINFO *************** *** 1643,1649 **** // that. mch_setmouse(FALSE); if (opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE) != OK) ! errmsg = e_invarg; else check_mouse_termcode(); if (termcap_active) --- 1643,1649 ---- // that. mch_setmouse(FALSE); if (opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE) != OK) ! errmsg = e_invalid_argument; else check_mouse_termcode(); if (termcap_active) *************** *** 1656,1669 **** { if (*p_sel == NUL || check_opt_strings(p_sel, p_sel_values, FALSE) != OK) ! errmsg = e_invarg; } // 'selectmode' else if (varp == &p_slm) { if (check_opt_strings(p_slm, p_slm_values, TRUE) != OK) ! errmsg = e_invarg; } #ifdef FEAT_BROWSE --- 1656,1669 ---- { if (*p_sel == NUL || check_opt_strings(p_sel, p_sel_values, FALSE) != OK) ! errmsg = e_invalid_argument; } // 'selectmode' else if (varp == &p_slm) { if (check_opt_strings(p_slm, p_slm_values, TRUE) != OK) ! errmsg = e_invalid_argument; } #ifdef FEAT_BROWSE *************** *** 1672,1678 **** { if (check_opt_strings(p_bsdir, p_bsdir_values, FALSE) != OK && !mch_isdir(p_bsdir)) ! errmsg = e_invarg; } #endif --- 1672,1678 ---- { if (check_opt_strings(p_bsdir, p_bsdir_values, FALSE) != OK && !mch_isdir(p_bsdir)) ! errmsg = e_invalid_argument; } #endif *************** *** 1680,1686 **** else if (varp == &p_km) { if (check_opt_strings(p_km, p_km_values, TRUE) != OK) ! errmsg = e_invarg; else { km_stopsel = (vim_strchr(p_km, 'o') != NULL); --- 1680,1686 ---- else if (varp == &p_km) { if (check_opt_strings(p_km, p_km_values, TRUE) != OK) ! errmsg = e_invalid_argument; else { km_stopsel = (vim_strchr(p_km, 'o') != NULL); *************** *** 1692,1698 **** else if (varp == &p_mousem) { if (check_opt_strings(p_mousem, p_mousem_values, FALSE) != OK) ! errmsg = e_invarg; #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU) && (XmVersion <= 1002) else if (*p_mousem != *oldval) // Changed from "extend" to "popup" or "popup_setpos" or vv: need --- 1692,1698 ---- else if (varp == &p_mousem) { if (check_opt_strings(p_mousem, p_mousem_values, FALSE) != OK) ! errmsg = e_invalid_argument; #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU) && (XmVersion <= 1002) else if (*p_mousem != *oldval) // Changed from "extend" to "popup" or "popup_setpos" or vv: need *************** *** 1705,1725 **** else if (varp == &p_swb) { if (opt_strings_flags(p_swb, p_swb_values, &swb_flags, TRUE) != OK) ! errmsg = e_invarg; } // 'debug' else if (varp == &p_debug) { if (check_opt_strings(p_debug, p_debug_values, TRUE) != OK) ! errmsg = e_invarg; } // 'display' else if (varp == &p_dy) { if (opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE) != OK) ! errmsg = e_invarg; else (void)init_chartab(); --- 1705,1725 ---- else if (varp == &p_swb) { if (opt_strings_flags(p_swb, p_swb_values, &swb_flags, TRUE) != OK) ! errmsg = e_invalid_argument; } // 'debug' else if (varp == &p_debug) { if (check_opt_strings(p_debug, p_debug_values, TRUE) != OK) ! errmsg = e_invalid_argument; } // 'display' else if (varp == &p_dy) { if (opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE) != OK) ! errmsg = e_invalid_argument; else (void)init_chartab(); *************** *** 1729,1735 **** else if (varp == &p_ead) { if (check_opt_strings(p_ead, p_ead_values, FALSE) != OK) ! errmsg = e_invarg; } #ifdef FEAT_CLIPBOARD --- 1729,1735 ---- else if (varp == &p_ead) { if (check_opt_strings(p_ead, p_ead_values, FALSE) != OK) ! errmsg = e_invalid_argument; } #ifdef FEAT_CLIPBOARD *************** *** 1748,1754 **** if ((is_spellfile && !valid_spellfile(*varp)) || (!is_spellfile && !valid_spelllang(*varp))) ! errmsg = e_invarg; else errmsg = did_set_spell_option(is_spellfile); } --- 1748,1754 ---- if ((is_spellfile && !valid_spellfile(*varp)) || (!is_spellfile && !valid_spelllang(*varp))) ! errmsg = e_invalid_argument; else errmsg = did_set_spell_option(is_spellfile); } *************** *** 1761,1779 **** else if (varp == &(curwin->w_s->b_p_spo)) { if (**varp != NUL && STRCMP("camel", *varp) != 0) ! errmsg = e_invarg; } // 'spellsuggest' else if (varp == &p_sps) { if (spell_check_sps() != OK) ! errmsg = e_invarg; } // 'mkspellmem' else if (varp == &p_msm) { if (spell_check_msm() != OK) ! errmsg = e_invarg; } #endif --- 1761,1779 ---- else if (varp == &(curwin->w_s->b_p_spo)) { if (**varp != NUL && STRCMP("camel", *varp) != 0) ! errmsg = e_invalid_argument; } // 'spellsuggest' else if (varp == &p_sps) { if (spell_check_sps() != OK) ! errmsg = e_invalid_argument; } // 'mkspellmem' else if (varp == &p_msm) { if (spell_check_msm() != OK) ! errmsg = e_invalid_argument; } #endif *************** *** 1781,1794 **** else if (gvarp == &p_bh) { if (check_opt_strings(curbuf->b_p_bh, p_bufhidden_values, FALSE) != OK) ! errmsg = e_invarg; } // When 'buftype' is set, check for valid value. else if (gvarp == &p_bt) { if (check_opt_strings(curbuf->b_p_bt, p_buftype_values, FALSE) != OK) ! errmsg = e_invarg; else { if (curwin->w_status_height) --- 1781,1794 ---- else if (gvarp == &p_bh) { if (check_opt_strings(curbuf->b_p_bh, p_bufhidden_values, FALSE) != OK) ! errmsg = e_invalid_argument; } // When 'buftype' is set, check for valid value. else if (gvarp == &p_bt) { if (check_opt_strings(curbuf->b_p_bt, p_buftype_values, FALSE) != OK) ! errmsg = e_invalid_argument; else { if (curwin->w_status_height) *************** *** 1876,1882 **** else if (varp == &p_cot) { if (check_opt_strings(p_cot, p_cot_values, TRUE) != OK) ! errmsg = e_invarg; else completeopt_was_set(); } --- 1876,1882 ---- else if (varp == &p_cot) { if (check_opt_strings(p_cot, p_cot_values, TRUE) != OK) ! errmsg = e_invalid_argument; else completeopt_was_set(); } *************** *** 1887,1893 **** { if (check_opt_strings(p_csl, p_csl_values, FALSE) != OK || check_opt_strings(curbuf->b_p_csl, p_csl_values, FALSE) != OK) ! errmsg = e_invarg; } #endif --- 1887,1893 ---- { if (check_opt_strings(p_csl, p_csl_values, FALSE) != OK || check_opt_strings(curbuf->b_p_csl, p_csl_values, FALSE) != OK) ! errmsg = e_invalid_argument; } #endif *************** *** 1896,1902 **** else if (varp == &curwin->w_p_scl) { if (check_opt_strings(*varp, p_scl_values, FALSE) != OK) ! errmsg = e_invarg; // When changing the 'signcolumn' to or from 'number', recompute the // width of the number column if 'number' or 'relativenumber' is set. if (((*oldval == 'n' && *(oldval + 1) == 'u') --- 1896,1902 ---- else if (varp == &curwin->w_p_scl) { if (check_opt_strings(*varp, p_scl_values, FALSE) != OK) ! errmsg = e_invalid_argument; // When changing the 'signcolumn' to or from 'number', recompute the // width of the number column if 'number' or 'relativenumber' is set. if (((*oldval == 'n' && *(oldval + 1) == 'u') *************** *** 1913,1919 **** { if (opt_strings_flags(p_toolbar, p_toolbar_values, &toolbar_flags, TRUE) != OK) ! errmsg = e_invarg; else { out_flush(); --- 1913,1919 ---- { if (opt_strings_flags(p_toolbar, p_toolbar_values, &toolbar_flags, TRUE) != OK) ! errmsg = e_invalid_argument; else { out_flush(); *************** *** 1928,1934 **** else if (varp == &p_tbis) { if (opt_strings_flags(p_tbis, p_tbis_values, &tbis_flags, FALSE) != OK) ! errmsg = e_invarg; else { out_flush(); --- 1928,1934 ---- else if (varp == &p_tbis) { if (opt_strings_flags(p_tbis, p_tbis_values, &tbis_flags, FALSE) != OK) ! errmsg = e_invalid_argument; else { out_flush(); *************** *** 1961,1975 **** if (VIM_ISDIGIT(*p_bs)) { if (*p_bs > '3' || p_bs[1] != NUL) ! errmsg = e_invarg; } else if (check_opt_strings(p_bs, p_bs_values, TRUE) != OK) ! errmsg = e_invarg; } else if (varp == &p_bo) { if (opt_strings_flags(p_bo, p_bo_values, &bo_flags, TRUE) != OK) ! errmsg = e_invarg; } // 'tagcase' --- 1961,1975 ---- if (VIM_ISDIGIT(*p_bs)) { if (*p_bs > '3' || p_bs[1] != NUL) ! errmsg = e_invalid_argument; } else if (check_opt_strings(p_bs, p_bs_values, TRUE) != OK) ! errmsg = e_invalid_argument; } else if (varp == &p_bo) { if (opt_strings_flags(p_bo, p_bo_values, &bo_flags, TRUE) != OK) ! errmsg = e_invalid_argument; } // 'tagcase' *************** *** 1993,2006 **** *flags = 0; else if (*p == NUL || opt_strings_flags(p, p_tc_values, flags, FALSE) != OK) ! errmsg = e_invarg; } // 'casemap' else if (varp == &p_cmp) { if (opt_strings_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE) != OK) ! errmsg = e_invarg; } #ifdef FEAT_DIFF --- 1993,2006 ---- *flags = 0; else if (*p == NUL || opt_strings_flags(p, p_tc_values, flags, FALSE) != OK) ! errmsg = e_invalid_argument; } // 'casemap' else if (varp == &p_cmp) { if (opt_strings_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE) != OK) ! errmsg = e_invalid_argument; } #ifdef FEAT_DIFF *************** *** 2008,2014 **** else if (varp == &p_dip) { if (diffopt_changed() == FAIL) ! errmsg = e_invarg; } #endif --- 2008,2014 ---- else if (varp == &p_dip) { if (diffopt_changed() == FAIL) ! errmsg = e_invalid_argument; } #endif *************** *** 2018,2024 **** { if (check_opt_strings(*varp, p_fdm_values, FALSE) != OK || *curwin->w_p_fdm == NUL) ! errmsg = e_invarg; else { foldUpdateAll(curwin); --- 2018,2024 ---- { if (check_opt_strings(*varp, p_fdm_values, FALSE) != OK || *curwin->w_p_fdm == NUL) ! errmsg = e_invalid_argument; else { foldUpdateAll(curwin); *************** *** 2033,2039 **** if (p == NULL) errmsg = N_("E536: comma required"); else if (p == *varp || p[1] == NUL) ! errmsg = e_invarg; else if (foldmethodIsMarker(curwin)) foldUpdateAll(curwin); } --- 2033,2039 ---- if (p == NULL) errmsg = N_("E536: comma required"); else if (p == *varp || p[1] == NUL) ! errmsg = e_invalid_argument; else if (foldmethodIsMarker(curwin)) foldUpdateAll(curwin); } *************** *** 2047,2059 **** else if (varp == &p_fdo) { if (opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE) != OK) ! errmsg = e_invarg; } // 'foldclose' else if (varp == &p_fcl) { if (check_opt_strings(p_fcl, p_fcl_values, TRUE) != OK) ! errmsg = e_invarg; } // 'foldignore' else if (gvarp == &curwin->w_allbuf_opt.wo_fdi) --- 2047,2059 ---- else if (varp == &p_fdo) { if (opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE) != OK) ! errmsg = e_invalid_argument; } // 'foldclose' else if (varp == &p_fcl) { if (check_opt_strings(p_fcl, p_fcl_values, TRUE) != OK) ! errmsg = e_invalid_argument; } // 'foldignore' else if (gvarp == &curwin->w_allbuf_opt.wo_fdi) *************** *** 2081,2087 **** else { if (opt_strings_flags(ve, p_ve_values, flags, TRUE) != OK) ! errmsg = e_invarg; else if (STRCMP(p_ve, oldval) != 0) { // Recompute cursor position in case the new 've' setting --- 2081,2087 ---- else { if (opt_strings_flags(ve, p_ve_values, flags, TRUE) != OK) ! errmsg = e_invalid_argument; else if (STRCMP(p_ve, oldval) != 0) { // Recompute cursor position in case the new 've' setting *************** *** 2105,2111 **** || vim_strchr((char_u *)CSQF_FLAGS, p[1]) == NULL || (p[2] != NUL && p[2] != ',')) { ! errmsg = e_invarg; break; } else if (p[2] == NUL) --- 2105,2111 ---- || vim_strchr((char_u *)CSQF_FLAGS, p[1]) == NULL || (p[2] != NUL && p[2] != ',')) { ! errmsg = e_invalid_argument; break; } else if (p[2] == NUL) *************** *** 2131,2144 **** else if (varp == &p_rop) { if (!gui_mch_set_rendering_options(p_rop)) ! errmsg = e_invarg; } #endif else if (gvarp == &p_ft) { if (!valid_filetype(*varp)) ! errmsg = e_invarg; else { value_changed = STRCMP(oldval, *varp) != 0; --- 2131,2144 ---- else if (varp == &p_rop) { if (!gui_mch_set_rendering_options(p_rop)) ! errmsg = e_invalid_argument; } #endif else if (gvarp == &p_ft) { if (!valid_filetype(*varp)) ! errmsg = e_invalid_argument; else { value_changed = STRCMP(oldval, *varp) != 0; *************** *** 2153,2159 **** else if (gvarp == &p_syn) { if (!valid_filetype(*varp)) ! errmsg = e_invarg; else { value_changed = STRCMP(oldval, *varp) != 0; --- 2153,2159 ---- else if (gvarp == &p_syn) { if (!valid_filetype(*varp)) ! errmsg = e_invalid_argument; else { value_changed = STRCMP(oldval, *varp) != 0; *************** *** 2171,2177 **** { if (*curwin->w_p_twk != NUL && string_to_key(curwin->w_p_twk, TRUE) == 0) ! errmsg = e_invarg; } // 'termwinsize' else if (varp == &curwin->w_p_tws) --- 2171,2177 ---- { if (*curwin->w_p_twk != NUL && string_to_key(curwin->w_p_twk, TRUE) == 0) ! errmsg = e_invalid_argument; } // 'termwinsize' else if (varp == &curwin->w_p_tws) *************** *** 2182,2188 **** if (p == curwin->w_p_tws || (*p != 'x' && *p != '*') || *skipdigits(p + 1) != NUL) ! errmsg = e_invarg; } } // 'wincolor' --- 2182,2188 ---- if (p == curwin->w_p_tws || (*p != 'x' && *p != '*') || *skipdigits(p + 1) != NUL) ! errmsg = e_invalid_argument; } } // 'wincolor' *************** *** 2193,2199 **** else if (varp == &p_twt) { if (check_opt_strings(*varp, p_twt_values, FALSE) != OK) ! errmsg = e_invarg; } # endif #endif --- 2193,2199 ---- else if (varp == &p_twt) { if (check_opt_strings(*varp, p_twt_values, FALSE) != OK) ! errmsg = e_invalid_argument; } # endif #endif *************** *** 2220,2226 **** continue; if (*cp == ',' && cp > *varp && *(cp-1) != ',') continue; ! errmsg = e_invarg; break; } if (errmsg == NULL) --- 2220,2226 ---- continue; if (*cp == ',' && cp > *varp && *(cp-1) != ',') continue; ! errmsg = e_invalid_argument; break; } if (errmsg == NULL) *************** *** 2232,2238 **** vim_free(oldarray); } else ! errmsg = e_invarg; } } } --- 2232,2238 ---- vim_free(oldarray); } else ! errmsg = e_invalid_argument; } } } *************** *** 2258,2264 **** continue; if (*cp == ',' && cp > *varp && *(cp-1) != ',') continue; ! errmsg = e_invarg; break; } if (errmsg == NULL) --- 2258,2264 ---- continue; if (*cp == ',' && cp > *varp && *(cp-1) != ',') continue; ! errmsg = e_invalid_argument; break; } if (errmsg == NULL) *************** *** 2274,2280 **** #endif } else ! errmsg = e_invarg; } } } --- 2274,2280 ---- #endif } else ! errmsg = e_invalid_argument; } } } *************** *** 2285,2298 **** else if (varp == &p_pvp) { if (parse_previewpopup(NULL) == FAIL) ! errmsg = e_invarg; } # ifdef FEAT_QUICKFIX // 'completepopup' else if (varp == &p_cpp) { if (parse_completepopup(NULL) == FAIL) ! errmsg = e_invarg; else popup_close_info(); } --- 2285,2298 ---- else if (varp == &p_pvp) { if (parse_previewpopup(NULL) == FAIL) ! errmsg = e_invalid_argument; } # ifdef FEAT_QUICKFIX // 'completepopup' else if (varp == &p_cpp) { if (parse_completepopup(NULL) == FAIL) ! errmsg = e_invalid_argument; else popup_close_info(); } *************** *** 2390,2410 **** else if (gvarp == &p_cfu) { if (set_completefunc_option() == FAIL) ! errmsg = e_invarg; } // 'omnifunc' else if (gvarp == &p_ofu) { if (set_omnifunc_option() == FAIL) ! errmsg = e_invarg; } // 'thesaurusfunc' else if (gvarp == &p_tsrfu) { if (set_thesaurusfunc_option() == FAIL) ! errmsg = e_invarg; } #endif --- 2390,2410 ---- else if (gvarp == &p_cfu) { if (set_completefunc_option() == FAIL) ! errmsg = e_invalid_argument; } // 'omnifunc' else if (gvarp == &p_ofu) { if (set_omnifunc_option() == FAIL) ! errmsg = e_invalid_argument; } // 'thesaurusfunc' else if (gvarp == &p_tsrfu) { if (set_thesaurusfunc_option() == FAIL) ! errmsg = e_invalid_argument; } #endif *************** *** 2414,2427 **** else if (gvarp == &p_imaf) { if (set_imactivatefunc_option() == FAIL) ! errmsg = e_invarg; } // 'imstatusfunc' else if (gvarp == &p_imsf) { if (set_imstatusfunc_option() == FAIL) ! errmsg = e_invarg; } #endif --- 2414,2427 ---- else if (gvarp == &p_imaf) { if (set_imactivatefunc_option() == FAIL) ! errmsg = e_invalid_argument; } // 'imstatusfunc' else if (gvarp == &p_imsf) { if (set_imstatusfunc_option() == FAIL) ! errmsg = e_invalid_argument; } #endif *************** *** 2429,2435 **** else if (varp == &p_opfunc) { if (set_operatorfunc_option() == FAIL) ! errmsg = e_invarg; } #ifdef FEAT_QUICKFIX --- 2429,2435 ---- else if (varp == &p_opfunc) { if (set_operatorfunc_option() == FAIL) ! errmsg = e_invalid_argument; } #ifdef FEAT_QUICKFIX *************** *** 2437,2443 **** else if (varp == &p_qftf) { if (qf_process_qftf_option() == FAIL) ! errmsg = e_invarg; } #endif --- 2437,2443 ---- else if (varp == &p_qftf) { if (qf_process_qftf_option() == FAIL) ! errmsg = e_invalid_argument; } #endif *************** *** 2446,2452 **** else if (gvarp == &p_tfu) { if (set_tagfunc_option() == FAIL) ! errmsg = e_invarg; } #endif --- 2446,2452 ---- else if (gvarp == &p_tfu) { if (set_tagfunc_option() == FAIL) ! errmsg = e_invalid_argument; } #endif *** ../vim-8.2.3960/src/popupwin.c 2021-12-22 19:44:55.474555117 +0000 --- src/popupwin.c 2021-12-31 22:44:04.603573092 +0000 *************** *** 407,413 **** return poppos_entries[nr].pp_val; if (give_error) ! semsg(_(e_invarg2), str); return POPPOS_NONE; } --- 407,413 ---- return poppos_entries[nr].pp_val; if (give_error) ! semsg(_(e_invalid_argument_str), str); return POPPOS_NONE; } *************** *** 468,474 **** if (nr <= 0) nr = find_prop_type_id(str, NULL); if (nr <= 0) ! semsg(_(e_invarg2), str); else wp->w_popup_prop_type = nr; } --- 468,474 ---- if (nr <= 0) nr = find_prop_type_id(str, NULL); if (nr <= 0) ! semsg(_(e_invalid_argument_str), str); else wp->w_popup_prop_type = nr; } *************** *** 497,503 **** else if (STRCMP(s, "expr") == 0) flags = FIND_IDENT | FIND_STRING | FIND_EVAL; else if (STRCMP(s, "any") != 0) ! semsg(_(e_invarg2), s); if (flags != 0) { if (mousemoved) --- 497,503 ---- else if (STRCMP(s, "expr") == 0) flags = FIND_IDENT | FIND_STRING | FIND_EVAL; else if (STRCMP(s, "any") != 0) ! semsg(_(e_invalid_argument_str), s); if (flags != 0) { if (mousemoved) *************** *** 546,552 **** } } else ! semsg(_(e_invarg2), tv_get_string(&di->di_tv)); } static void --- 546,552 ---- } } else ! semsg(_(e_invalid_argument_str), tv_get_string(&di->di_tv)); } static void *************** *** 559,565 **** if (di != NULL) { if (di->di_tv.v_type != VAR_STRING) ! semsg(_(e_invargval), name); else { str = tv_get_string(&di->di_tv); --- 559,565 ---- if (di != NULL) { if (di->di_tv.v_type != VAR_STRING) ! semsg(_(e_invalid_value_for_argument_str), name); else { str = tv_get_string(&di->di_tv); *************** *** 735,741 **** else ok = FALSE; if (!ok) ! semsg(_(e_invargNval), "close", tv_get_string(&di->di_tv)); } str = dict_get_string(dict, (char_u *)"highlight", FALSE); --- 735,741 ---- else ok = FALSE; if (!ok) ! semsg(_(e_invalid_value_for_argument_str_str), "close", tv_get_string(&di->di_tv)); } str = dict_get_string(dict, (char_u *)"highlight", FALSE); *************** *** 861,867 **** VIM_CLEAR(wp->w_popup_mask_cells); } else ! semsg(_(e_invargval), "mask"); } #if defined(FEAT_TIMERS) --- 861,867 ---- VIM_CLEAR(wp->w_popup_mask_cells); } else ! semsg(_(e_invalid_value_for_argument_str), "mask"); } #if defined(FEAT_TIMERS) *************** *** 2645,2651 **** if (wp != NULL) { if (argvars[1].v_type != VAR_STRING && argvars[1].v_type != VAR_LIST) ! semsg(_(e_invarg2), tv_get_string(&argvars[1])); else { popup_set_buffer_text(wp->w_buffer, argvars[1]); --- 2645,2651 ---- if (wp != NULL) { if (argvars[1].v_type != VAR_STRING && argvars[1].v_type != VAR_LIST) ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[1])); else { popup_set_buffer_text(wp->w_buffer, argvars[1]); *** ../vim-8.2.3960/src/quickfix.c 2021-12-27 17:21:38.016449116 +0000 --- src/quickfix.c 2021-12-31 21:05:01.622854763 +0000 *************** *** 7653,7659 **** // A dict argument cannot be specified with a non-empty list argument if (list->lv_len != 0 && what != NULL) { ! semsg(_(e_invarg2), _("cannot have both a list and a \"what\" argument")); return FAIL; } --- 7653,7659 ---- // A dict argument cannot be specified with a non-empty list argument if (list->lv_len != 0 && what != NULL) { ! semsg(_(e_invalid_argument_str), _("cannot have both a list and a \"what\" argument")); return FAIL; } *************** *** 7780,7786 **** if (buf == NULL) { ! emsg(_(e_invarg)); return FAIL; } --- 7780,7786 ---- if (buf == NULL) { ! emsg(_(e_invalid_argument)); return FAIL; } *** ../vim-8.2.3960/src/screen.c 2021-12-27 17:21:38.016449116 +0000 --- src/screen.c 2021-12-31 20:58:02.335466888 +0000 *************** *** 4915,4933 **** s = p + len + 1; c1 = get_encoded_char_adv(&s); if (char2cells(c1) > 1) ! return e_invarg; if (tab[i].cp == &lcs_chars.tab2) { if (*s == NUL) ! return e_invarg; c2 = get_encoded_char_adv(&s); if (char2cells(c2) > 1) ! return e_invarg; if (!(*s == ',' || *s == NUL)) { c3 = get_encoded_char_adv(&s); if (char2cells(c3) > 1) ! return e_invarg; } } --- 4915,4933 ---- s = p + len + 1; c1 = get_encoded_char_adv(&s); if (char2cells(c1) > 1) ! return e_invalid_argument; if (tab[i].cp == &lcs_chars.tab2) { if (*s == NUL) ! return e_invalid_argument; c2 = get_encoded_char_adv(&s); if (char2cells(c2) > 1) ! return e_invalid_argument; if (!(*s == ',' || *s == NUL)) { c3 = get_encoded_char_adv(&s); if (char2cells(c3) > 1) ! return e_invalid_argument; } } *************** *** 4969,4980 **** { c1 = get_encoded_char_adv(&s); if (char2cells(c1) > 1) ! return e_invarg; ++multispace_len; } if (multispace_len == 0) // lcs-multispace cannot be an empty string ! return e_invarg; p = s; } else --- 4969,4980 ---- { c1 = get_encoded_char_adv(&s); if (char2cells(c1) > 1) ! return e_invalid_argument; ++multispace_len; } if (multispace_len == 0) // lcs-multispace cannot be an empty string ! return e_invalid_argument; p = s; } else *************** *** 4991,4997 **** } } else ! return e_invarg; } if (*p == ',') --- 4991,4997 ---- } } else ! return e_invalid_argument; } if (*p == ',') *** ../vim-8.2.3960/src/scriptfile.c 2021-12-31 17:25:44.044304828 +0000 --- src/scriptfile.c 2021-12-31 20:58:06.683459342 +0000 *************** *** 965,971 **** cmd_source(char_u *fname, exarg_T *eap) { if (*fname == NUL) ! emsg(_(e_argreq)); else if (eap != NULL && eap->forceit) // ":source!": read Normal mode commands --- 965,971 ---- cmd_source(char_u *fname, exarg_T *eap) { if (*fname == NUL) ! emsg(_(e_argument_required)); else if (eap != NULL && eap->forceit) // ":source!": read Normal mode commands *************** *** 1441,1447 **** #endif if (got_int) ! emsg(_(e_interr)); ESTACK_CHECK_NOW estack_pop(); if (p_verbose > 1) --- 1441,1447 ---- #endif if (got_int) ! emsg(_(e_interrupted)); ESTACK_CHECK_NOW estack_pop(); if (p_verbose > 1) *************** *** 1549,1555 **** { // :script {scriptId}: edit the script if (!SCRIPT_ID_VALID(eap->line2)) ! emsg(_(e_invarg)); else { eap->arg = SCRIPT_ITEM(eap->line2)->sn_name; --- 1549,1555 ---- { // :script {scriptId}: edit the script if (!SCRIPT_ID_VALID(eap->line2)) ! emsg(_(e_invalid_argument)); else { eap->arg = SCRIPT_ITEM(eap->line2)->sn_name; *************** *** 1961,1967 **** nr = getdigits(&eap->arg); if (nr == 0 || *eap->arg != NUL) ! emsg(_(e_invarg)); else if (nr > SCRIPT_VERSION_MAX) semsg(_("E999: scriptversion not supported: %d"), nr); else --- 1961,1967 ---- nr = getdigits(&eap->arg); if (nr == 0 || *eap->arg != NUL) ! emsg(_(e_invalid_argument)); else if (nr > SCRIPT_VERSION_MAX) semsg(_("E999: scriptversion not supported: %d"), nr); else *** ../vim-8.2.3960/src/search.c 2021-12-29 18:09:10.242453334 +0000 --- src/search.c 2021-12-31 22:19:58.541164372 +0000 *************** *** 1120,1126 **** if (!found) // did not find it { if (got_int) ! emsg(_(e_interr)); else if ((options & SEARCH_MSG) == SEARCH_MSG) { if (p_ws) --- 1120,1126 ---- if (!found) // did not find it { if (got_int) ! emsg(_(e_interrupted)); else if ((options & SEARCH_MSG) == SEARCH_MSG) { if (p_ws) *************** *** 3990,3996 **** else if (!found && action != ACTION_EXPAND) { if (got_int || ins_compl_interrupted()) ! emsg(_(e_interr)); else if (type == FIND_DEFINE) emsg(_("E388: Couldn't find definition")); else --- 3990,3996 ---- else if (!found && action != ACTION_EXPAND) { if (got_int || ins_compl_interrupted()) ! emsg(_(e_interrupted)); else if (type == FIND_DEFINE) emsg(_("E388: Couldn't find definition")); else *************** *** 4152,4163 **** { if (di->di_tv.v_type != VAR_LIST) { ! semsg(_(e_invarg2), "pos"); return; } if (list_len(di->di_tv.vval.v_list) != 3) { ! semsg(_(e_invarg2), "List format should be [lnum, col, off]"); return; } li = list_find(di->di_tv.vval.v_list, 0L); --- 4152,4163 ---- { if (di->di_tv.v_type != VAR_LIST) { ! semsg(_(e_invalid_argument_str), "pos"); return; } if (list_len(di->di_tv.vval.v_list) != 3) { ! semsg(_(e_invalid_argument_str), "List format should be [lnum, col, off]"); return; } li = list_find(di->di_tv.vval.v_list, 0L); *************** *** 4813,4819 **** if (argvars[1].v_type != VAR_STRING || argvars[1].vval.v_string == NULL) { ! semsg(_(e_invarg2), tv_get_string(&argvars[1])); return; } --- 4813,4819 ---- if (argvars[1].v_type != VAR_STRING || argvars[1].vval.v_string == NULL) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[1])); return; } *************** *** 4837,4843 **** || di->di_tv.vval.v_string == NULL || *di->di_tv.vval.v_string == NUL) { ! semsg(_(e_invarg2), tv_get_string(&di->di_tv)); return; } key = tv_get_string(&di->di_tv); --- 4837,4843 ---- || di->di_tv.vval.v_string == NULL || *di->di_tv.vval.v_string == NUL) { ! semsg(_(e_invalid_argument_str), tv_get_string(&di->di_tv)); return; } key = tv_get_string(&di->di_tv); *************** *** 4847,4853 **** cb = get_callback(&di->di_tv); if (cb.cb_name == NULL) { ! semsg(_(e_invargval), "text_cb"); return; } } --- 4847,4853 ---- cb = get_callback(&di->di_tv); if (cb.cb_name == NULL) { ! semsg(_(e_invalid_value_for_argument_str), "text_cb"); return; } } *** ../vim-8.2.3960/src/sign.c 2021-12-31 15:09:23.334140877 +0000 --- src/sign.c 2021-12-31 21:05:09.610844895 +0000 *************** *** 1379,1385 **** } else { ! semsg(_(e_invarg2), arg); failed = TRUE; break; } --- 1379,1385 ---- } else { ! semsg(_(e_invalid_argument_str), arg); failed = TRUE; break; } *************** *** 1422,1428 **** // :sign place group=* if (lnum >= 0 || sign_name != NULL || (group != NULL && *group == '\0')) ! emsg(_(e_invarg)); else sign_list_placed(buf, group); } --- 1422,1428 ---- // :sign place group=* if (lnum >= 0 || sign_name != NULL || (group != NULL && *group == '\0')) ! emsg(_(e_invalid_argument)); else sign_list_placed(buf, group); } *************** *** 1432,1438 **** if (sign_name == NULL || buf == NULL || (group != NULL && *group == '\0')) { ! emsg(_(e_invarg)); return; } --- 1432,1438 ---- if (sign_name == NULL || buf == NULL || (group != NULL && *group == '\0')) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1453,1459 **** { if (lnum >= 0 || sign_name != NULL || (group != NULL && *group == '\0')) { ! emsg(_(e_invarg)); return; } --- 1453,1459 ---- { if (lnum >= 0 || sign_name != NULL || (group != NULL && *group == '\0')) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1522,1528 **** { if (sign_name == NULL && group == NULL && id == -1) { ! emsg(_(e_argreq)); return; } --- 1522,1528 ---- { if (sign_name == NULL && group == NULL && id == -1) { ! emsg(_(e_argument_required)); return; } *************** *** 1531,1537 **** { // File or buffer is not specified or an empty group is used // or a line number or a sign name is specified. ! emsg(_(e_invarg)); return; } (void)sign_jump(id, group, buf); --- 1531,1537 ---- { // File or buffer is not specified or an empty group is used // or a line number or a sign name is specified. ! emsg(_(e_invalid_argument)); return; } (void)sign_jump(id, group, buf); *************** *** 1586,1592 **** { if (*signid != -1) { ! emsg(_(e_invarg)); return FAIL; } *signid = -2; --- 1586,1592 ---- { if (*signid != -1) { ! emsg(_(e_invalid_argument)); return FAIL; } *signid = -2; *************** *** 1635,1641 **** } else { ! emsg(_(e_invarg)); return FAIL; } arg = skipwhite(arg); --- 1635,1641 ---- } else { ! emsg(_(e_invalid_argument)); return FAIL; } arg = skipwhite(arg); *************** *** 2471,2477 **** return; if (sign_id <= 0) { ! emsg(_(e_invarg)); return; } --- 2471,2477 ---- return; if (sign_id <= 0) { ! emsg(_(e_invalid_argument)); return; } *************** *** 2537,2543 **** return -1; if (sign_id < 0) { ! emsg(_(e_invarg)); return -1; } } --- 2537,2543 ---- return -1; if (sign_id < 0) { ! emsg(_(e_invalid_argument)); return -1; } } *************** *** 2599,2605 **** lnum = tv_get_lnum(&di->di_tv); if (lnum <= 0) { ! emsg(_(e_invarg)); goto cleanup; } } --- 2599,2605 ---- lnum = tv_get_lnum(&di->di_tv); if (lnum <= 0) { ! emsg(_(e_invalid_argument)); goto cleanup; } } *************** *** 2791,2797 **** sign_id = dict_get_number(dict, (char_u *)"id"); if (sign_id <= 0) { ! emsg(_(e_invarg)); goto cleanup; } } --- 2791,2797 ---- sign_id = dict_get_number(dict, (char_u *)"id"); if (sign_id <= 0) { ! emsg(_(e_invalid_argument)); goto cleanup; } } *************** *** 2866,2872 **** if (argvars[0].v_type != VAR_STRING) { ! emsg(_(e_invarg)); return; } --- 2866,2872 ---- if (argvars[0].v_type != VAR_STRING) { ! emsg(_(e_invalid_argument)); return; } *** ../vim-8.2.3960/src/spell.c 2021-12-27 17:21:38.020449109 +0000 --- src/spell.c 2021-12-31 20:58:20.447435454 +0000 *************** *** 4378,4384 **** l = (int)STRLEN(curwin->w_s->b_p_spf); if (l > 0 && (l < 4 || STRCMP(curwin->w_s->b_p_spf + l - 4, ".add") != 0)) ! errmsg = e_invarg; } if (errmsg == NULL) --- 4378,4384 ---- l = (int)STRLEN(curwin->w_s->b_p_spf); if (l > 0 && (l < 4 || STRCMP(curwin->w_s->b_p_spf + l - 4, ".add") != 0)) ! errmsg = e_invalid_argument; } if (errmsg == NULL) *************** *** 4416,4422 **** if (synblock->b_cap_prog == NULL) { synblock->b_cap_prog = rp; // restore the previous program ! return e_invarg; } } } --- 4416,4422 ---- if (synblock->b_cap_prog == NULL) { synblock->b_cap_prog = rp; // restore the previous program ! return e_invalid_argument; } } } *** ../vim-8.2.3960/src/spellfile.c 2021-12-31 15:09:23.334140877 +0000 --- src/spellfile.c 2021-12-31 20:58:23.831429573 +0000 *************** *** 5963,5969 **** } if (incount <= 0) ! emsg(_(e_invarg)); // need at least output and input names else if (vim_strchr(gettail(wfname), '_') != NULL) emsg(_("E751: Output file name must not have region name")); else if (incount > MAXREGIONS) --- 5963,5969 ---- } if (incount <= 0) ! emsg(_(e_invalid_argument)); // need at least output and input names else if (vim_strchr(gettail(wfname), '_') != NULL) emsg(_("E751: Output file name must not have region name")); else if (incount > MAXREGIONS) *** ../vim-8.2.3960/src/strings.c 2021-12-27 17:21:38.020449109 +0000 --- src/strings.c 2021-12-31 21:05:13.806839695 +0000 *************** *** 1061,1067 **** && argvars[2].v_type != VAR_NUMBER && argvars[2].v_type != VAR_BOOL)) { ! emsg(_(e_invarg)); return; } --- 1061,1067 ---- && argvars[2].v_type != VAR_NUMBER && argvars[2].v_type != VAR_BOOL)) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1163,1169 **** base = (int)tv_get_number(&argvars[1]); if (base != 2 && base != 8 && base != 10 && base != 16) { ! emsg(_(e_invarg)); return; } if (argvars[2].v_type != VAR_UNKNOWN && tv_get_bool(&argvars[2])) --- 1163,1169 ---- base = (int)tv_get_number(&argvars[1]); if (base != 2 && base != 8 && base != 10 && base != 16) { ! emsg(_(e_invalid_argument)); return; } if (argvars[2].v_type != VAR_UNKNOWN && tv_get_bool(&argvars[2])) *************** *** 1680,1686 **** if (STRLEN(fromstr) != STRLEN(tostr)) { error: ! semsg(_(e_invarg2), fromstr); ga_clear(&ga); return; } --- 1680,1686 ---- if (STRLEN(fromstr) != STRLEN(tostr)) { error: ! semsg(_(e_invalid_argument_str), fromstr); ga_clear(&ga); return; } *************** *** 1788,1794 **** if (argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_STRING) { ! semsg(_(e_invarg2), tv_get_string(&argvars[1])); return; } --- 1788,1794 ---- if (argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_STRING) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[1])); return; } *************** *** 1806,1812 **** return; if (dir < 0 || dir > 2) { ! semsg(_(e_invarg2), tv_get_string(&argvars[2])); return; } } --- 1806,1812 ---- return; if (dir < 0 || dir > 2) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[2])); return; } } *** ../vim-8.2.3960/src/syntax.c 2021-11-20 19:50:56.428908005 +0000 --- src/syntax.c 2021-12-31 21:05:21.222830484 +0000 *************** *** 4923,4929 **** if (rest != NULL) set_nextcmd(eap, rest); else ! semsg(_(e_invarg2), arg); redraw_curbuf_later(SOME_VALID); syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. --- 4923,4929 ---- if (rest != NULL) set_nextcmd(eap, rest); else ! semsg(_(e_invalid_argument_str), arg); redraw_curbuf_later(SOME_VALID); syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. *************** *** 5032,5038 **** vim_free(syn_opt_arg.next_list); if (rest == NULL && called_emsg == orig_called_emsg) ! semsg(_(e_invarg2), arg); } /* --- 5032,5038 ---- vim_free(syn_opt_arg.next_list); if (rest == NULL && called_emsg == orig_called_emsg) ! semsg(_(e_invalid_argument_str), arg); } /* *************** *** 5298,5304 **** if (not_enough) semsg(_("E399: Not enough arguments: syntax region %s"), arg); else if (illegal || rest == NULL) ! semsg(_(e_invarg2), arg); } } --- 5298,5304 ---- if (not_enough) semsg(_("E399: Not enough arguments: syntax region %s"), arg); else if (illegal || rest == NULL) ! semsg(_(e_invalid_argument_str), arg); } } *************** *** 5607,5613 **** clstr_list = NULL; if (get_id_list(&rest, opt_len, &clstr_list, eap->skip) == FAIL) { ! semsg(_(e_invarg2), rest); break; } if (scl_id >= 0) --- 5607,5613 ---- clstr_list = NULL; if (get_id_list(&rest, opt_len, &clstr_list, eap->skip) == FAIL) { ! semsg(_(e_invalid_argument_str), rest); break; } if (scl_id >= 0) *************** *** 5628,5634 **** if (!got_clstr) emsg(_("E400: No cluster specified")); if (rest == NULL || !ends_excmd2(eap->cmd, rest)) ! semsg(_(e_invarg2), arg); } /* --- 5628,5634 ---- if (!got_clstr) emsg(_("E400: No cluster specified")); if (rest == NULL || !ends_excmd2(eap->cmd, rest)) ! semsg(_(e_invalid_argument_str), arg); } /* *************** *** 6632,6638 **** else if (STRCMP(eap->arg, "report") == 0) syntime_report(); else ! semsg(_(e_invarg2), eap->arg); } static void --- 6632,6638 ---- else if (STRCMP(eap->arg, "report") == 0) syntime_report(); else ! semsg(_(e_invalid_argument_str), eap->arg); } static void *** ../vim-8.2.3960/src/terminal.c 2021-12-27 17:21:38.020449109 +0000 --- src/terminal.c 2021-12-31 22:20:02.809161387 +0000 *************** *** 459,465 **** && argvar->vval.v_list != NULL && argvar->vval.v_list->lv_first == &range_list_item)) { ! emsg(_(e_invarg)); return NULL; } --- 459,465 ---- && argvar->vval.v_list != NULL && argvar->vval.v_list->lv_first == &range_list_item)) { ! emsg(_(e_invalid_argument)); return NULL; } *************** *** 872,878 **** tty_type = 'c'; else { ! semsg(e_invargval, "type"); goto theend; } opt.jo_set2 |= JO2_TTY_TYPE; --- 872,878 ---- tty_type = 'c'; else { ! semsg(e_invalid_value_for_argument_str, "type"); goto theend; } opt.jo_set2 |= JO2_TTY_TYPE; *************** *** 4241,4247 **** || var->di_tv.vval.v_list == NULL || var->di_tv.vval.v_list->lv_first == &range_list_item || set_ansi_colors_list(vterm, var->di_tv.vval.v_list) == FAIL)) ! semsg(_(e_invarg2), "g:terminal_ansi_colors"); } #endif --- 4241,4247 ---- || var->di_tv.vval.v_list == NULL || var->di_tv.vval.v_list->lv_first == &range_list_item || set_ansi_colors_list(vterm, var->di_tv.vval.v_list) == FAIL)) ! semsg(_(e_invalid_argument_str), "g:terminal_ansi_colors"); } #endif *************** *** 5368,5374 **** fname2 = tv_get_string_buf_chk(&argvars[1], buf2); if (fname1 == NULL || (do_diff && fname2 == NULL)) { ! emsg(_(e_invarg)); return; } fd1 = mch_fopen((char *)fname1, READBIN); --- 5368,5374 ---- fname2 = tv_get_string_buf_chk(&argvars[1], buf2); if (fname1 == NULL || (do_diff && fname2 == NULL)) { ! emsg(_(e_invalid_argument)); return; } fd1 = mch_fopen((char *)fname1, READBIN); *************** *** 5414,5420 **** // With "bufnr" argument: enter the window with this buffer and make it // empty. if (wp == NULL) ! semsg(_(e_invarg2), "bufnr"); else { buf = curbuf; --- 5414,5420 ---- // With "bufnr" argument: enter the window with this buffer and make it // empty. if (wp == NULL) ! semsg(_(e_invalid_argument_str), "bufnr"); else { buf = curbuf; *************** *** 6093,6099 **** p = buf->b_term->tl_job->jv_tty_in; break; default: ! semsg(_(e_invarg2), tv_get_string(&argvars[1])); return; } if (p != NULL) --- 6093,6099 ---- p = buf->b_term->tl_job->jv_tty_in; break; default: ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[1])); return; } if (p != NULL) *************** *** 6351,6357 **** } if (set_ansi_colors_list(term->tl_vterm, argvars[1].vval.v_list) == FAIL) ! emsg(_(e_invarg)); } #endif --- 6351,6357 ---- } if (set_ansi_colors_list(term->tl_vterm, argvars[1].vval.v_list) == FAIL) ! emsg(_(e_invalid_argument)); } #endif *************** *** 6689,6695 **** } if (cmd == NULL || *cmd == NUL) { ! emsg(_(e_invarg)); goto failed; } --- 6689,6695 ---- } if (cmd == NULL || *cmd == NUL) { ! emsg(_(e_invalid_argument)); goto failed; } *************** *** 7037,7043 **** } if (cmd == NULL || *cmd == NUL) { ! emsg(_(e_invarg)); goto failed; } --- 7037,7043 ---- } if (cmd == NULL || *cmd == NUL) { ! emsg(_(e_invalid_argument)); goto failed; } *** ../vim-8.2.3960/src/testing.c 2021-07-27 21:00:39.753712380 +0100 --- src/testing.c 2021-12-31 21:05:32.894815882 +0000 *************** *** 907,918 **** || argvars[1].v_type != VAR_NUMBER || argvars[1].vval.v_number < 0 || argvars[2].v_type != VAR_NUMBER) ! emsg(_(e_invarg)); else { alloc_fail_id = argvars[0].vval.v_number; if (alloc_fail_id >= aid_last) ! emsg(_(e_invarg)); alloc_fail_countdown = argvars[1].vval.v_number; alloc_fail_repeat = argvars[2].vval.v_number; did_outofmem_msg = FALSE; --- 907,918 ---- || argvars[1].v_type != VAR_NUMBER || argvars[1].vval.v_number < 0 || argvars[2].v_type != VAR_NUMBER) ! emsg(_(e_invalid_argument)); else { alloc_fail_id = argvars[0].vval.v_number; if (alloc_fail_id >= aid_last) ! emsg(_(e_invalid_argument)); alloc_fail_countdown = argvars[1].vval.v_number; alloc_fail_repeat = argvars[2].vval.v_number; did_outofmem_msg = FALSE; *************** *** 967,973 **** return; if (argvars[0].v_type != VAR_STRING) ! emsg(_(e_invarg)); else { char_u *name = tv_get_string(&argvars[0]); --- 967,973 ---- return; if (argvars[0].v_type != VAR_STRING) ! emsg(_(e_invalid_argument)); else { char_u *name = tv_get_string(&argvars[0]); *************** *** 975,981 **** if (STRCMP(name, (char_u *)"need_fileinfo") == 0) rettv->vval.v_number = need_fileinfo; else ! semsg(_(e_invarg2), name); } } --- 975,981 ---- if (STRCMP(name, (char_u *)"need_fileinfo") == 0) rettv->vval.v_number = need_fileinfo; else ! semsg(_(e_invalid_argument_str), name); } } *************** *** 991,1002 **** return; if (argvars[0].v_type != VAR_STRING) ! emsg(_(e_invarg)); else { name = tv_get_string(&argvars[0]); if (reset_option_was_set(name) == FAIL) ! semsg(_(e_invarg2), name); } } --- 991,1002 ---- return; if (argvars[0].v_type != VAR_STRING) ! emsg(_(e_invalid_argument)); else { name = tv_get_string(&argvars[0]); if (reset_option_was_set(name) == FAIL) ! semsg(_(e_invalid_argument_str), name); } } *************** *** 1017,1023 **** if (argvars[0].v_type != VAR_STRING || (argvars[1].v_type) != VAR_NUMBER) ! emsg(_(e_invarg)); else { name = tv_get_string(&argvars[0]); --- 1017,1023 ---- if (argvars[0].v_type != VAR_STRING || (argvars[1].v_type) != VAR_NUMBER) ! emsg(_(e_invalid_argument)); else { name = tv_get_string(&argvars[0]); *************** *** 1072,1078 **** } } else ! semsg(_(e_invarg2), name); } } --- 1072,1078 ---- } } else ! semsg(_(e_invalid_argument_str), name); } } *************** *** 1171,1177 **** return; if (argvars[0].v_type != VAR_STRING) ! emsg(_(e_invarg)); else ignore_error_for_testing(tv_get_string(&argvars[0])); } --- 1171,1177 ---- return; if (argvars[0].v_type != VAR_STRING) ! emsg(_(e_invalid_argument)); else ignore_error_for_testing(tv_get_string(&argvars[0])); } *************** *** 1264,1270 **** || (argvars[1].v_type) != VAR_NUMBER || (argvars[2].v_type) != VAR_NUMBER) { ! emsg(_(e_invarg)); return; } which = tv_get_string(&argvars[0]); --- 1264,1270 ---- || (argvars[1].v_type) != VAR_NUMBER || (argvars[2].v_type) != VAR_NUMBER) { ! emsg(_(e_invalid_argument)); return; } which = tv_get_string(&argvars[0]); *************** *** 1279,1285 **** sb = &gui.bottom_sbar; if (sb == NULL) { ! semsg(_(e_invarg2), which); return; } gui_drag_scrollbar(sb, value, dragging); --- 1279,1285 ---- sb = &gui.bottom_sbar; if (sb == NULL) { ! semsg(_(e_invalid_argument_str), which); return; } gui_drag_scrollbar(sb, value, dragging); *************** *** 1300,1306 **** if (argvars[0].v_type != VAR_NUMBER || (argvars[1].v_type) != VAR_NUMBER) { ! emsg(_(e_invarg)); return; } --- 1300,1306 ---- if (argvars[0].v_type != VAR_NUMBER || (argvars[1].v_type) != VAR_NUMBER) { ! emsg(_(e_invalid_argument)); return; } *** ../vim-8.2.3960/src/textprop.c 2021-12-27 20:57:03.483387913 +0000 --- src/textprop.c 2021-12-31 22:20:08.533157356 +0000 *************** *** 362,368 **** if (error || start_lnum <= 0 || start_col <= 0 || end_lnum <= 0 || end_col <= 0) { ! emsg(_(e_invarg)); return; } if (prop_add_one(buf, type_name, id, start_lnum, end_lnum, --- 362,368 ---- if (error || start_lnum <= 0 || start_col <= 0 || end_lnum <= 0 || end_col <= 0) { ! emsg(_(e_invalid_argument)); return; } if (prop_add_one(buf, type_name, id, start_lnum, end_lnum, *************** *** 405,411 **** end_lnum = dict_get_number(dict, (char_u *)"end_lnum"); if (end_lnum < start_lnum) { ! semsg(_(e_invargval), "end_lnum"); return; } } --- 405,411 ---- end_lnum = dict_get_number(dict, (char_u *)"end_lnum"); if (end_lnum < start_lnum) { ! semsg(_(e_invalid_value_for_argument_str), "end_lnum"); return; } } *************** *** 418,424 **** if (length < 0 || end_lnum > start_lnum) { ! semsg(_(e_invargval), "length"); return; } end_col = start_col + length; --- 418,424 ---- if (length < 0 || end_lnum > start_lnum) { ! semsg(_(e_invalid_value_for_argument_str), "length"); return; } end_col = start_col + length; *************** *** 428,434 **** end_col = dict_get_number(dict, (char_u *)"end_col"); if (end_col <= 0) { ! semsg(_(e_invargval), "end_col"); return; } } --- 428,434 ---- end_col = dict_get_number(dict, (char_u *)"end_col"); if (end_col <= 0) { ! semsg(_(e_invalid_value_for_argument_str), "end_col"); return; } } *************** *** 750,756 **** dir = -1; else if (*dir_s != 'f') { ! emsg(_(e_invarg)); return; } } --- 750,756 ---- dir = -1; else if (*dir_s != 'f') { ! emsg(_(e_invalid_argument)); return; } } *************** *** 1179,1185 **** if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL) { ! emsg(_(e_invarg)); return; } --- 1179,1185 ---- if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1316,1322 **** name = tv_get_string(&argvars[0]); if (*name == NUL) { ! emsg(_(e_invarg)); return; } --- 1316,1322 ---- name = tv_get_string(&argvars[0]); if (*name == NUL) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1451,1457 **** name = tv_get_string(&argvars[0]); if (*name == NUL) { ! emsg(_(e_invarg)); return; } --- 1451,1457 ---- name = tv_get_string(&argvars[0]); if (*name == NUL) { ! emsg(_(e_invalid_argument)); return; } *************** *** 1492,1498 **** name = tv_get_string(&argvars[0]); if (*name == NUL) { ! emsg(_(e_invarg)); return; } if (rettv_dict_alloc(rettv) == OK) --- 1492,1498 ---- name = tv_get_string(&argvars[0]); if (*name == NUL) { ! emsg(_(e_invalid_argument)); return; } if (rettv_dict_alloc(rettv) == OK) *** ../vim-8.2.3960/src/time.c 2021-12-09 18:42:54.029929797 +0000 --- src/time.c 2021-12-31 21:05:36.702811104 +0000 *************** *** 190,196 **** if (list2proftime(&argvars[0], &res) == FAIL) { if (in_vim9script()) ! emsg(_(e_invarg)); return; } profile_end(&res); --- 190,196 ---- if (list2proftime(&argvars[0], &res) == FAIL) { if (in_vim9script()) ! emsg(_(e_invalid_argument)); return; } profile_end(&res); *************** *** 202,208 **** || list2proftime(&argvars[1], &res) == FAIL) { if (in_vim9script()) ! emsg(_(e_invarg)); return; } profile_sub(&res, &start); --- 202,208 ---- || list2proftime(&argvars[1], &res) == FAIL) { if (in_vim9script()) ! emsg(_(e_invalid_argument)); return; } profile_sub(&res, &start); *************** *** 240,246 **** if (list2proftime(&argvars[0], &tm) == OK) rettv->vval.v_float = profile_float(&tm); else if (in_vim9script()) ! emsg(_(e_invarg)); # endif } # endif --- 240,246 ---- if (list2proftime(&argvars[0], &tm) == OK) rettv->vval.v_float = profile_float(&tm); else if (in_vim9script()) ! emsg(_(e_invalid_argument)); # endif } # endif *************** *** 264,270 **** if (list2proftime(&argvars[0], &tm) == OK) rettv->vval.v_string = vim_strsave((char_u *)profile_msg(&tm)); else if (in_vim9script()) ! emsg(_(e_invarg)); # endif } --- 264,270 ---- if (list2proftime(&argvars[0], &tm) == OK) rettv->vval.v_string = vim_strsave((char_u *)profile_msg(&tm)); else if (in_vim9script()) ! emsg(_(e_invalid_argument)); # endif } *************** *** 842,848 **** if (argvars[2].v_type != VAR_DICT || (dict = argvars[2].vval.v_dict) == NULL) { ! semsg(_(e_invarg2), tv_get_string(&argvars[2])); return; } if (dict_find(dict, (char_u *)"repeat", -1) != NULL) --- 842,848 ---- if (argvars[2].v_type != VAR_DICT || (dict = argvars[2].vval.v_dict) == NULL) { ! semsg(_(e_invalid_argument_str), tv_get_string(&argvars[2])); return; } if (dict_find(dict, (char_u *)"repeat", -1) != NULL) *** ../vim-8.2.3960/src/userfunc.c 2021-12-31 17:25:44.044304828 +0000 --- src/userfunc.c 2021-12-31 21:05:42.538803756 +0000 *************** *** 254,260 **** if (mustend && *p != endchar) { if (!skip) ! semsg(_(e_invarg2), *argp); goto err_ret; } if (*p == endchar) --- 254,260 ---- if (mustend && *p != endchar) { if (!skip) ! semsg(_(e_invalid_argument_str), *argp); goto err_ret; } if (*p == endchar) *************** *** 3692,3698 **** if (!aborting()) { if (end != NULL) ! semsg(_(e_invarg2), start); } else *pp = find_name_end(start, NULL, NULL, FNE_INCL_BR); --- 3692,3698 ---- if (!aborting()) { if (end != NULL) ! semsg(_(e_invalid_argument_str), start); } else *pp = find_name_end(start, NULL, NULL, FNE_INCL_BR); *************** *** 4258,4264 **** : eval_isnamec(name_base[i])); ++i) ; if (name_base[i] != NUL) ! emsg_funcname((char *)e_invarg2, arg); // In Vim9 script a function cannot have the same name as a // variable. --- 4258,4264 ---- : eval_isnamec(name_base[i])); ++i) ; if (name_base[i] != NUL) ! emsg_funcname((char *)e_invalid_argument_str, arg); // In Vim9 script a function cannot have the same name as a // variable. *************** *** 4909,4915 **** if (numbered_function(name) && fudi.fd_dict == NULL) { if (!eap->skip) ! semsg(_(e_invarg2), eap->arg); vim_free(name); return; } --- 4909,4915 ---- if (numbered_function(name) && fudi.fd_dict == NULL) { if (!eap->skip) ! semsg(_(e_invalid_argument_str), eap->arg); vim_free(name); return; } *** ../vim-8.2.3960/src/vim9cmds.c 2021-12-31 17:25:44.044304828 +0000 --- src/vim9cmds.c 2021-12-31 20:43:16.580964123 +0000 *************** *** 1016,1022 **** if (scope == NULL || scope->se_type != FOR_SCOPE) { ! emsg(_(e_for)); return NULL; } forscope = &scope->se_u.se_for; --- 1016,1022 ---- if (scope == NULL || scope->se_type != FOR_SCOPE) { ! emsg(_(e_endfor_without_for)); return NULL; } forscope = &scope->se_u.se_for; *************** *** 1109,1115 **** return NULL; if (scope == NULL || scope->se_type != WHILE_SCOPE) { ! emsg(_(e_while)); return NULL; } cctx->ctx_scope = scope->se_outer; --- 1109,1115 ---- return NULL; if (scope == NULL || scope->se_type != WHILE_SCOPE) { ! emsg(_(e_endwhile_without_while)); return NULL; } cctx->ctx_scope = scope->se_outer; *************** *** 1328,1334 **** // Error if not in a :try scope if (scope == NULL || scope->se_type != TRY_SCOPE) { ! emsg(_(e_catch)); return NULL; } --- 1328,1334 ---- // Error if not in a :try scope if (scope == NULL || scope->se_type != TRY_SCOPE) { ! emsg(_(e_catch_without_try)); return NULL; } *************** *** 1447,1453 **** // Error if not in a :try scope if (scope == NULL || scope->se_type != TRY_SCOPE) { ! emsg(_(e_finally)); return NULL; } --- 1447,1453 ---- // Error if not in a :try scope if (scope == NULL || scope->se_type != TRY_SCOPE) { ! emsg(_(e_finally_without_try)); return NULL; } *************** *** 1457,1463 **** isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label; if (isn->isn_arg.tryref.try_ref->try_finally != 0) { ! emsg(_(e_finally_dup)); return NULL; } --- 1457,1463 ---- isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label; if (isn->isn_arg.tryref.try_ref->try_finally != 0) { ! emsg(_(e_multiple_finally)); return NULL; } *************** *** 1518,1524 **** if (scope == NULL || scope->se_type != TRY_SCOPE) { if (scope == NULL) ! emsg(_(e_no_endtry)); else if (scope->se_type == WHILE_SCOPE) emsg(_(e_missing_endwhile)); else if (scope->se_type == FOR_SCOPE) --- 1518,1524 ---- if (scope == NULL || scope->se_type != TRY_SCOPE) { if (scope == NULL) ! emsg(_(e_endtry_without_try)); else if (scope->se_type == WHILE_SCOPE) emsg(_(e_missing_endwhile)); else if (scope->se_type == FOR_SCOPE) *** ../vim-8.2.3960/src/vim9execute.c 2021-12-27 17:21:38.024449102 +0000 --- src/vim9execute.c 2021-12-31 21:05:45.482800034 +0000 *************** *** 6022,6028 **** TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD, NULL, NULL, NULL); if (fname == NULL) { ! semsg(_(e_invarg2), eap->arg); return; } --- 6022,6028 ---- TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD, NULL, NULL, NULL); if (fname == NULL) { ! semsg(_(e_invalid_argument_str), eap->arg); return; } *** ../vim-8.2.3960/src/vim9script.c 2021-12-20 15:03:23.251346520 +0000 --- src/vim9script.c 2021-12-31 21:05:49.514794927 +0000 *************** *** 83,89 **** } if (!IS_WHITE_OR_NUL(*eap->arg) && STRCMP(eap->arg, "noclear") != 0) { ! semsg(_(e_invarg2), eap->arg); return; } if (si->sn_state == SN_STATE_RELOAD && IS_WHITE_OR_NUL(*eap->arg)) --- 83,89 ---- } if (!IS_WHITE_OR_NUL(*eap->arg) && STRCMP(eap->arg, "noclear") != 0) { ! semsg(_(e_invalid_argument_str), eap->arg); return; } if (si->sn_state == SN_STATE_RELOAD && IS_WHITE_OR_NUL(*eap->arg)) *************** *** 771,777 **** // Check for valid starting character. if (!eval_isnamec1(*arg)) { ! semsg(_(e_invarg2), arg); return arg + STRLEN(arg); } --- 771,777 ---- // Check for valid starting character. if (!eval_isnamec1(*arg)) { ! semsg(_(e_invalid_argument_str), arg); return arg + STRLEN(arg); } *** ../vim-8.2.3960/src/window.c 2021-12-27 17:21:38.024449102 +0000 --- src/window.c 2021-12-31 20:59:00.855365249 +0000 *************** *** 6990,6996 **** col = (*s == '-') ? -1 : 1; ++s; if (!VIM_ISDIGIT(*s)) ! return e_invarg; col = col * getdigits(&s); if (wp->w_buffer->b_p_tw == 0) goto skip; // 'textwidth' not set, skip this item --- 6990,6996 ---- col = (*s == '-') ? -1 : 1; ++s; if (!VIM_ISDIGIT(*s)) ! return e_invalid_argument; col = col * getdigits(&s); if (wp->w_buffer->b_p_tw == 0) goto skip; // 'textwidth' not set, skip this item *************** *** 7001,7015 **** else if (VIM_ISDIGIT(*s)) col = getdigits(&s); else ! return e_invarg; color_cols[count++] = col - 1; // 1-based to 0-based skip: if (*s == NUL) break; if (*s != ',') ! return e_invarg; if (*++s == NUL) ! return e_invarg; // illegal trailing comma as in "set cc=80," } vim_free(wp->w_p_cc_cols); --- 7001,7015 ---- else if (VIM_ISDIGIT(*s)) col = getdigits(&s); else ! return e_invalid_argument; color_cols[count++] = col - 1; // 1-based to 0-based skip: if (*s == NUL) break; if (*s != ',') ! return e_invalid_argument; if (*++s == NUL) ! return e_invalid_argument; // illegal trailing comma as in "set cc=80," } vim_free(wp->w_p_cc_cols); *** ../vim-8.2.3960/src/version.c 2021-12-31 19:59:48.870000502 +0000 --- src/version.c 2021-12-31 22:47:17.651446047 +0000 *************** *** 751,752 **** --- 751,754 ---- { /* Add new patch number below this line */ + /**/ + 3961, /**/ -- hundred-and-one symptoms of being an internet addict: 169. You hire a housekeeper for your home page. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///