Patch 8.2.3985

15 views
Skip to first unread message

Bram Moolenaar

unread,
Jan 2, 2022, 2:26:13 PM1/2/22
to vim...@googlegroups.com

Patch 8.2.3985
Problem: Error messages are spread out.
Solution: Move more error messages to errors.h.
Files: src/errors.h, src/findfile.c, src/fold.c, src/hardcopy.c,
src/highlight.c, src/map.c, src/message.c, src/normal.c,
src/option.c, src/os_amiga.c, src/os_unix.c, src/os_win32.c,
src/quickfix.c, src/regexp.c, src/register.c, src/search.c,
src/syntax.c, src/tag.c, src/term.c, src/typval.c, src/undo.c,
src/window.c


*** ../vim-8.2.3984/src/errors.h 2022-01-02 17:00:36.998093306 +0000
--- src/errors.h 2022-01-02 19:22:03.038562110 +0000
***************
*** 812,838 ****
INIT(= N_("E348: No string under cursor"));
EXTERN char e_no_identifier_under_cursor[]
INIT(= N_("E349: No identifier under cursor"));
!
#if defined(AMIGA) || defined(MACOS_X) || defined(MSWIN) \
|| defined(UNIX) || defined(VMS)
EXTERN char e_screen_mode_setting_not_supported[]
INIT(= N_("E359: Screen mode setting not supported"));
#endif
EXTERN char e_pattern_uses_more_memory_than_maxmempattern[]
INIT(= N_("E363: pattern uses more memory than 'maxmempattern'"));
#ifdef FEAT_LIBCALL
EXTERN char e_library_call_failed_for_str[]
INIT(= N_("E364: Library call failed for \"%s()\""));
#endif
EXTERN char e_no_such_group_str[]
INIT(= N_("E367: No such group: \"%s\""));
#ifdef USING_LOAD_LIBRARY
EXTERN char e_could_not_load_library_str_str[]
INIT(= N_("E370: Could not load library %s: %s"));
#endif
EXTERN char e_cannot_write_buftype_option_is_set[]
INIT(= N_("E382: Cannot write, 'buftype' option is set"));
!
#ifdef USING_LOAD_LIBRARY
EXTERN char e_could_not_load_library_function_str[]
INIT(= N_("E448: Could not load library function %s"));
--- 812,1024 ----
INIT(= N_("E348: No string under cursor"));
EXTERN char e_no_identifier_under_cursor[]
INIT(= N_("E349: No identifier under cursor"));
! EXTERN char e_cannot_create_fold_with_current_foldmethod[]
! INIT(= N_("E350: Cannot create fold with current 'foldmethod'"));
! EXTERN char e_cannot_delete_fold_with_current_foldmethod[]
! INIT(= N_("E351: Cannot delete fold with current 'foldmethod'"));
! EXTERN char e_cannot_erase_folds_with_current_foldmethod[]
! INIT(= N_("E352: Cannot erase folds with current 'foldmethod'"));
! EXTERN char e_nothing_in_register_str[]
! INIT(= N_("E353: Nothing in register %s"));
! EXTERN char e_invalid_register_name_str[]
! INIT(= N_("E354: Invalid register name: '%s'"));
! EXTERN char e_unknown_option_str_2[]
! INIT(= N_("E355: Unknown option: %s"));
! EXTERN char e_get_varp_error[]
! INIT(= N_("E356: get_varp ERROR"));
! EXTERN char e_langmap_matching_character_missing_for_str[]
! INIT(= N_("E357: 'langmap': Matching character missing for %s"));
! EXTERN char e_langmap_extra_characters_after_semicolon_str[]
! INIT(= N_("E358: 'langmap': Extra characters after semicolon: %s"));
#if defined(AMIGA) || defined(MACOS_X) || defined(MSWIN) \
|| defined(UNIX) || defined(VMS)
EXTERN char e_screen_mode_setting_not_supported[]
INIT(= N_("E359: Screen mode setting not supported"));
#endif
+ EXTERN char e_cannot_execute_shell_with_f_option[]
+ INIT(= N_("E360: Cannot execute shell with -f option"));
+ // E361 unused
+ EXTERN char e_using_boolean_valud_as_float[]
+ INIT(= N_("E362: Using a boolean value as a Float"));
EXTERN char e_pattern_uses_more_memory_than_maxmempattern[]
INIT(= N_("E363: pattern uses more memory than 'maxmempattern'"));
#ifdef FEAT_LIBCALL
EXTERN char e_library_call_failed_for_str[]
INIT(= N_("E364: Library call failed for \"%s()\""));
#endif
+ #ifdef FEAT_POSTSCRIPT
+ EXTERN char e_failed_to_print_postscript_file[]
+ INIT(= N_("E365: Failed to print PostScript file"));
+ #endif
+ EXTERN char e_not_allowed_to_enter_popup_window[]
+ INIT(= N_("E366: Not allowed to enter a popup window"));
EXTERN char e_no_such_group_str[]
INIT(= N_("E367: No such group: \"%s\""));
+ #ifdef FEAT_LIBCALL
+ EXTERN char e_got_sig_str_in_libcall[]
+ INIT(= N_("E368: got SIG%s in libcall()"));
+ #endif
+ EXTERN char e_invalid_item_in_str_brackets[]
+ INIT(= N_("E369: invalid item in %s%%[]"));
#ifdef USING_LOAD_LIBRARY
EXTERN char e_could_not_load_library_str_str[]
INIT(= N_("E370: Could not load library %s: %s"));
#endif
+ #ifdef FEAT_GUI_MSWIN
+ EXTERN char e_command_not_found[]
+ INIT(= N_("E371: Command not found"));
+ #endif
+ EXTERN char e_too_many_chr_in_format_string[]
+ INIT(= N_("E372: Too many %%%c in format string"));
+ EXTERN char e_unexpected_chr_in_format_str[]
+ INIT(= N_("E373: Unexpected %%%c in format string"));
+ EXTERN char e_missing_rsb_in_format_string[]
+ INIT(= N_("E374: Missing ] in format string"));
+ EXTERN char e_unsupported_chr_in_format_string[]
+ INIT(= N_("E375: Unsupported %%%c in format string"));
+ EXTERN char e_invalid_chr_in_format_string_prefix[]
+ INIT(= N_("E376: Invalid %%%c in format string prefix"));
+ EXTERN char e_invalid_chr_in_format_string[]
+ INIT(= N_("E377: Invalid %%%c in format string"));
+ EXTERN char e_errorformat_contains_no_pattern[]
+ INIT(= N_("E378: 'errorformat' contains no pattern"));
+ EXTERN char e_missing_or_empty_directory_name[]
+ INIT(= N_("E379: Missing or empty directory name"));
+ EXTERN char e_at_bottom_of_quickfix_stack[]
+ INIT(= N_("E380: At bottom of quickfix stack"));
+ EXTERN char e_at_top_of_quickfix_stack[]
+ INIT(= N_("E381: At top of quickfix stack"));
EXTERN char e_cannot_write_buftype_option_is_set[]
INIT(= N_("E382: Cannot write, 'buftype' option is set"));
! EXTERN char e_invalid_search_string_str[]
! INIT(= N_("E383: Invalid search string: %s"));
! EXTERN char e_search_hit_top_without_match_for_str[]
! INIT(= N_("E384: search hit TOP without match for: %s"));
! EXTERN char e_search_hit_bottom_without_match_for_str[]
! INIT(= N_("E385: search hit BOTTOM without match for: %s"));
! EXTERN char e_expected_question_or_slash_after_semicolon[]
! INIT(= N_("E386: Expected '?' or '/' after ';'"));
! EXTERN char e_match_is_on_current_line[]
! INIT(= N_("E387: Match is on current line"));
! EXTERN char e_couldnt_find_definition[]
! INIT(= N_("E388: Couldn't find definition"));
! EXTERN char e_couldnt_find_pattern[]
! INIT(= N_("E389: Couldn't find pattern"));
! EXTERN char e_illegal_argument_str_2[]
! INIT(= N_("E390: Illegal argument: %s"));
! EXTERN char e_no_such_syntax_cluster_1[]
! INIT(= N_("E391: No such syntax cluster: %s"));
! EXTERN char e_no_such_syntax_cluster_2[]
! INIT(= N_("E392: No such syntax cluster: %s"));
! EXTERN char e_groupthere_not_accepted_here[]
! INIT(= N_("E393: group[t]here not accepted here"));
! EXTERN char e_didnt_find_region_item_for_str[]
! INIT(= N_("E394: Didn't find region item for %s"));
! EXTERN char e_contains_argument_not_accepted_here[]
! INIT(= N_("E395: contains argument not accepted here"));
! // E396 unused
! EXTERN char e_filename_required[]
! INIT(= N_("E397: Filename required"));
! EXTERN char e_missing_equal_str[]
! INIT(= N_("E398: Missing '=': %s"));
! EXTERN char e_not_enough_arguments_syntax_region_str[]
! INIT(= N_("E399: Not enough arguments: syntax region %s"));
! EXTERN char e_no_cluster_specified[]
! INIT(= N_("E400: No cluster specified"));
! EXTERN char e_pattern_delimiter_not_found_str[]
! INIT(= N_("E401: Pattern delimiter not found: %s"));
! EXTERN char e_garbage_after_pattern_str[]
! INIT(= N_("E402: Garbage after pattern: %s"));
! EXTERN char e_syntax_sync_line_continuations_pattern_specified_twice[]
! INIT(= N_("E403: syntax sync: line continuations pattern specified twice"));
! EXTERN char e_illegal_arguments_str[]
! INIT(= N_("E404: Illegal arguments: %s"));
! EXTERN char e_missing_equal_sign_str[]
! INIT(= N_("E405: Missing equal sign: %s"));
! EXTERN char e_empty_argument_str[]
! INIT(= N_("E406: Empty argument: %s"));
! EXTERN char e_str_not_allowed_here[]
! INIT(= N_("E407: %s not allowed here"));
! EXTERN char e_str_must_be_first_in_contains_list[]
! INIT(= N_("E408: %s must be first in contains list"));
! EXTERN char e_unknown_group_name_str[]
! INIT(= N_("E409: Unknown group name: %s"));
! EXTERN char e_invalid_syntax_subcommand_str[]
! INIT(= N_("E410: Invalid :syntax subcommand: %s"));
! EXTERN char e_highlight_group_name_not_found_str[]
! INIT(= N_("E411: highlight group not found: %s"));
! EXTERN char e_not_enough_arguments_highlight_link_str[]
! INIT(= N_("E412: Not enough arguments: \":highlight link %s\""));
! EXTERN char e_too_many_arguments_highlight_link_str[]
! INIT(= N_("E413: Too many arguments: \":highlight link %s\""));
! EXTERN char e_group_has_settings_highlight_link_ignored[]
! INIT(= N_("E414: group has settings, highlight link ignored"));
! EXTERN char e_unexpected_equal_sign_str[]
! INIT(= N_("E415: unexpected equal sign: %s"));
! EXTERN char e_missing_equal_sign_str_2[]
! INIT(= N_("E416: missing equal sign: %s"));
! EXTERN char e_missing_argument_str[]
! INIT(= N_("E417: missing argument: %s"));
! EXTERN char e_illegal_value_str[]
! INIT(= N_("E418: Illegal value: %s"));
! EXTERN char e_fg_color_unknown[]
! INIT(= N_("E419: FG color unknown"));
! EXTERN char e_bg_color_unknown[]
! INIT(= N_("E420: BG color unknown"));
! EXTERN char e_color_name_or_number_not_recognized[]
! INIT(= N_("E421: Color name or number not recognized: %s"));
! EXTERN char e_terminal_code_too_long_str[]
! INIT(= N_("E422: terminal code too long: %s"));
! EXTERN char e_illegal_argument_str_3[]
! INIT(= N_("E423: Illegal argument: %s"));
! EXTERN char e_too_many_different_highlighting_attributes_in_use[]
! INIT(= N_("E424: Too many different highlighting attributes in use"));
! EXTERN char e_cannot_go_before_first_matching_tag[]
! INIT(= N_("E425: Cannot go before first matching tag"));
! EXTERN char e_tag_not_found_str[]
! INIT(= N_("E426: tag not found: %s"));
! EXTERN char e_there_is_only_one_matching_tag[]
! INIT(= N_("E427: There is only one matching tag"));
! EXTERN char e_cannot_go_beyond_last_matching_tag[]
! INIT(= N_("E428: Cannot go beyond last matching tag"));
! EXTERN char e_file_str_does_not_exist[]
! INIT(= N_("E429: File \"%s\" does not exist"));
! EXTERN char e_tag_file_path_truncated_for_str[]
! INIT(= N_("E430: Tag file path truncated for %s\n"));
! EXTERN char e_format_error_in_tags_file_str[]
! INIT(= N_("E431: Format error in tags file \"%s\""));
! EXTERN char e_tags_file_not_sorted_str[]
! INIT(= N_("E432: Tags file not sorted: %s"));
! EXTERN char e_no_tags_file[]
! INIT(= N_("E433: No tags file"));
! EXTERN char e_canot_find_tag_pattern[]
! INIT(= N_("E434: Can't find tag pattern"));
! EXTERN char e_couldnt_find_tag_just_guessing[]
! INIT(= N_("E435: Couldn't find tag, just guessing!"));
! EXTERN char e_no_str_entry_in_termcap[]
! INIT(= N_("E436: No \"%s\" entry in termcap"));
! EXTERN char e_terminal_capability_cm_required[]
! INIT(= N_("E437: terminal capability \"cm\" required"));
! EXTERN char e_u_undo_line_numbers_wrong[]
! INIT(= N_("E438: u_undo: line numbers wrong"));
! EXTERN char e_undo_list_corrupt[]
! INIT(= N_("E439: undo list corrupt"));
! EXTERN char e_undo_line_missing[]
! INIT(= N_("E440: undo line missing"));
! EXTERN char e_there_is_no_preview_window[]
! INIT(= N_("E441: There is no preview window"));
! EXTERN char e_cant_split_topleft_and_botright_at_the_same_time[]
! INIT(= N_("E442: Can't split topleft and botright at the same time"));
! EXTERN char e_cannot_rotate_when_another_window_is_split[]
! INIT(= N_("E443: Cannot rotate when another window is split"));
! EXTERN char e_cannot_close_last_window[]
! INIT(= N_("E444: Cannot close last window"));
! EXTERN char e_other_window_contains_changes[]
! INIT(= N_("E445: Other window contains changes"));
! EXTERN char e_no_file_name_under_cursor[]
! INIT(= N_("E446: No file name under cursor"));
! EXTERN char e_cant_find_file_str_in_path_2[]
! INIT(= N_("E447: Can't find file \"%s\" in path"));
#ifdef USING_LOAD_LIBRARY
EXTERN char e_could_not_load_library_function_str[]
INIT(= N_("E448: Could not load library function %s"));
***************
*** 841,846 ****
--- 1027,1033 ----
EXTERN char e_invalid_expression_received[]
INIT(= N_("E449: Invalid expression received"));
#endif
+
#if defined(UNIX) || defined(FEAT_SESSION)
EXTERN char e_cannot_go_back_to_previous_directory[]
INIT(= N_("E459: Cannot go back to previous directory"));
*** ../vim-8.2.3984/src/findfile.c 2022-01-02 17:00:37.002093302 +0000
--- src/findfile.c 2022-01-02 19:13:11.032038072 +0000
***************
*** 2007,2013 ****
if (*ptr == NUL) // nothing found
{
if (options & FNAME_MESS)
! emsg(_("E446: No file name under cursor"));
return NULL;
}

--- 2007,2013 ----
if (*ptr == NUL) // nothing found
{
if (options & FNAME_MESS)
! emsg(_(e_no_file_name_under_cursor));
return NULL;
}

***************
*** 2165,2171 ****
{
c = ptr[len];
ptr[len] = NUL;
! semsg(_("E447: Can't find file \"%s\" in path"), ptr);
ptr[len] = c;
}

--- 2165,2171 ----
{
c = ptr[len];
ptr[len] = NUL;
! semsg(_(e_cant_find_file_str_in_path_2), ptr);
ptr[len] = c;
}

*** ../vim-8.2.3984/src/fold.c 2021-12-27 17:21:38.008449130 +0000
--- src/fold.c 2022-01-02 17:45:07.059225544 +0000
***************
*** 563,571 ****
if (foldmethodIsManual(curwin) || foldmethodIsMarker(curwin))
return TRUE;
if (create)
! emsg(_("E350: Cannot create fold with current 'foldmethod'"));
else
! emsg(_("E351: Cannot delete fold with current 'foldmethod'"));
return FALSE;
}

--- 563,571 ----
if (foldmethodIsManual(curwin) || foldmethodIsMarker(curwin))
return TRUE;
if (create)
! emsg(_(e_cannot_create_fold_with_current_foldmethod));
else
! emsg(_(e_cannot_delete_fold_with_current_foldmethod));
return FALSE;
}

*** ../vim-8.2.3984/src/hardcopy.c 2022-01-02 17:00:37.002093302 +0000
--- src/hardcopy.c 2022-01-02 17:50:12.962845941 +0000
***************
*** 3135,3141 ****

// Not printing to a file: use 'printexpr' to print the file.
if (eval_printexpr(prt_ps_file_name, psettings->arguments) == FAIL)
! emsg(_("E365: Failed to print PostScript file"));
else
prt_message((char_u *)_("Print job sent."));
}
--- 3135,3141 ----

// Not printing to a file: use 'printexpr' to print the file.
if (eval_printexpr(prt_ps_file_name, psettings->arguments) == FAIL)
! emsg(_(e_failed_to_print_postscript_file));
else
prt_message((char_u *)_("Print job sent."));
}
*** ../vim-8.2.3984/src/highlight.c 2022-01-01 14:19:44.044353848 +0000
--- src/highlight.c 2022-01-02 19:21:56.642578034 +0000
***************
*** 656,662 ****
&& hl_has_settings(from_id - 1, dodefault))
{
if (SOURCING_NAME == NULL && !dodefault)
! emsg(_("E414: group has settings, highlight link ignored"));
}
else if (hlgroup->sg_link != to_id
#ifdef FEAT_EVAL
--- 656,662 ----
&& hl_has_settings(from_id - 1, dodefault))
{
if (SOURCING_NAME == NULL && !dodefault)
! emsg(_(e_group_has_settings_highlight_link_ignored));
}
else if (hlgroup->sg_link != to_id
#ifdef FEAT_EVAL
***************
*** 781,787 ****
}
if (i < 0)
{
! semsg(_("E418: Illegal value: %s"), arg);
return FALSE;
}
if (arg[off] == ',') // another one follows
--- 781,787 ----
}
if (i < 0)
{
! semsg(_(e_illegal_value_str), arg);
return FALSE;
}
if (arg[off] == ',') // another one follows
***************
*** 1033,1039 ****
color = cterm_normal_fg_color - 1;
else
{
! emsg(_("E419: FG color unknown"));
return FALSE;
}
}
--- 1033,1039 ----
color = cterm_normal_fg_color - 1;
else
{
! emsg(_(e_fg_color_unknown));
return FALSE;
}
}
***************
*** 1043,1049 ****
color = cterm_normal_bg_color - 1;
else
{
! emsg(_("E420: BG color unknown"));
return FALSE;
}
}
--- 1043,1049 ----
color = cterm_normal_bg_color - 1;
else
{
! emsg(_(e_bg_color_unknown));
return FALSE;
}
}
***************
*** 1069,1076 ****
break;
if (i < 0)
{
! semsg(_("E421: Color name or number not recognized: %s"),
! key_start);
return FALSE;
}

--- 1069,1075 ----
break;
if (i < 0)
{
! semsg(_(e_color_name_or_number_not_recognized), key_start);
return FALSE;
}

***************
*** 1323,1329 ****
// Append it to the already found stuff
if ((int)(STRLEN(buf) + STRLEN(p)) >= 99)
{
! semsg(_("E422: terminal code too long: %s"), arg);
return FALSE;
}
STRCAT(buf, p);
--- 1322,1328 ----
// Append it to the already found stuff
if ((int)(STRLEN(buf) + STRLEN(p)) >= 99)
{
! semsg(_(e_terminal_code_too_long_str), arg);
return FALSE;
}
STRCAT(buf, p);
***************
*** 1440,1446 ****
{
id = syn_namen2id(line, (int)(name_end - line));
if (id == 0)
! semsg(_("E411: highlight group not found: %s"), line);
else
highlight_list_one(id);
return;
--- 1439,1445 ----
{
id = syn_namen2id(line, (int)(name_end - line));
if (id == 0)
! semsg(_(e_highlight_group_name_not_found_str), line);
else
highlight_list_one(id);
return;
***************
*** 1462,1476 ****

if (ends_excmd2(line, from_start) || ends_excmd2(line, to_start))
{
! semsg(_("E412: Not enough arguments: \":highlight link %s\""),
! from_start);
return;
}

if (!ends_excmd2(line, skipwhite(to_end)))
{
! semsg(_("E413: Too many arguments: \":highlight link %s\""),
! from_start);
return;
}

--- 1461,1473 ----

if (ends_excmd2(line, from_start) || ends_excmd2(line, to_start))
{
! semsg(_(e_not_enough_arguments_highlight_link_str), from_start);
return;
}

if (!ends_excmd2(line, skipwhite(to_end)))
{
! semsg(_(e_too_many_arguments_highlight_link_str), from_start);
return;
}

***************
*** 1533,1539 ****
key_start = linep;
if (*linep == '=')
{
! semsg(_("E415: unexpected equal sign: %s"), key_start);
error = TRUE;
break;
}
--- 1530,1536 ----
key_start = linep;
if (*linep == '=')
{
! semsg(_(e_unexpected_equal_sign_str), key_start);
error = TRUE;
break;
}
***************
*** 1565,1571 ****
// Check for the equal sign.
if (*linep != '=')
{
! semsg(_("E416: missing equal sign: %s"), key_start);
error = TRUE;
break;
}
--- 1562,1568 ----
// Check for the equal sign.
if (*linep != '=')
{
! semsg(_(e_missing_equal_sign_str_2), key_start);
error = TRUE;
break;
}
***************
*** 1591,1597 ****
}
if (linep == arg_start)
{
! semsg(_("E417: missing argument: %s"), key_start);
error = TRUE;
break;
}
--- 1588,1594 ----
}
if (linep == arg_start)
{
! semsg(_(e_missing_argument_str), key_start);
error = TRUE;
break;
}
***************
*** 1671,1677 ****
}
else
{
! semsg(_("E423: Illegal argument: %s"), key_start);
error = TRUE;
break;
}
--- 1668,1674 ----
}
else
{
! semsg(_(e_illegal_argument_str_3), key_start);
error = TRUE;
break;
}
***************
*** 2529,2535 ****
// When called recursively, we are really out of numbers.
if (recursive)
{
! emsg(_("E424: Too many different highlighting attributes in use"));
return 0;
}
recursive = TRUE;
--- 2526,2532 ----
// When called recursively, we are really out of numbers.
if (recursive)
{
! emsg(_(e_too_many_different_highlighting_attributes_in_use));
return 0;
}
recursive = TRUE;
*** ../vim-8.2.3984/src/map.c 2022-01-01 14:19:44.048353841 +0000
--- src/map.c 2022-01-02 17:46:30.691124331 +0000
***************
*** 2706,2712 ****
}
if (to == NUL)
{
! semsg(_("E357: 'langmap': Matching character missing for %s"),
transchar(from));
return;
}
--- 2706,2712 ----
}
if (to == NUL)
{
! semsg(_(e_langmap_matching_character_missing_for_str),
transchar(from));
return;
}
***************
*** 2728,2734 ****
{
if (p[0] != ',')
{
! semsg(_("E358: 'langmap': Extra characters after semicolon: %s"), p);
return;
}
++p;
--- 2728,2734 ----
{
if (p[0] != ',')
{
! semsg(_(e_langmap_extra_characters_after_semicolon_str), p);
return;
}
++p;
*** ../vim-8.2.3984/src/message.c 2022-01-01 14:19:44.048353841 +0000
--- src/message.c 2022-01-02 17:46:56.091093171 +0000
***************
*** 891,897 ****
void
emsg_invreg(int name)
{
! semsg(_("E354: Invalid register name: '%s'"), transchar(name));
}

/*
--- 891,897 ----
void
emsg_invreg(int name)
{
! semsg(_(e_invalid_register_name_str), transchar(name));
}

/*
*** ../vim-8.2.3984/src/normal.c 2022-01-02 17:00:37.002093302 +0000
--- src/normal.c 2022-01-02 17:47:25.323057086 +0000
***************
*** 3080,3086 ****
deleteFold((linenr_T)1, curbuf->b_ml.ml_line_count,
TRUE, FALSE);
else
! emsg(_("E352: Cannot erase folds with current 'foldmethod'"));
break;

// "zn": fold none: reset 'foldenable'
--- 3080,3086 ----
deleteFold((linenr_T)1, curbuf->b_ml.ml_line_count,
TRUE, FALSE);
else
! emsg(_(e_cannot_erase_folds_with_current_foldmethod));
break;

// "zn": fold none: reset 'foldenable'
*** ../vim-8.2.3984/src/option.c 2022-01-01 15:58:19.114486366 +0000
--- src/option.c 2022-01-02 19:09:08.624882097 +0000
***************
*** 4352,4358 ****
return NULL;
}

! semsg(_("E355: Unknown option: %s"), name);
}
else
{
--- 4352,4358 ----
return NULL;
}

! semsg(_(e_unknown_option_str_2), name);
}
else
{
***************
*** 5520,5526 ****
case PV_VSTS: return (char_u *)&(curbuf->b_p_vsts);
case PV_VTS: return (char_u *)&(curbuf->b_p_vts);
#endif
! default: iemsg(_("E356: get_varp ERROR"));
}
// always return a valid pointer to avoid a crash!
return (char_u *)&(curbuf->b_p_wm);
--- 5520,5526 ----
case PV_VSTS: return (char_u *)&(curbuf->b_p_vsts);
case PV_VTS: return (char_u *)&(curbuf->b_p_vts);
#endif
! default: iemsg(_(e_get_varp_error));
}
// always return a valid pointer to avoid a crash!
return (char_u *)&(curbuf->b_p_wm);
*** ../vim-8.2.3984/src/os_amiga.c 2021-12-27 17:21:38.016449116 +0000
--- src/os_amiga.c 2022-01-02 17:50:42.074808650 +0000
***************
*** 1256,1262 ****
if (close_win)
{
// if Vim opened a window: Executing a shell may cause crashes
! emsg(_("E360: Cannot execute shell with -f option"));
return -1;
}

--- 1256,1262 ----
if (close_win)
{
// if Vim opened a window: Executing a shell may cause crashes
! emsg(_(e_cannot_execute_shell_with_f_option));
return -1;
}

*** ../vim-8.2.3984/src/os_unix.c 2022-01-01 14:19:44.048353841 +0000
--- src/os_unix.c 2022-01-02 17:51:39.822734199 +0000
***************
*** 7575,7581 ****
for (i = 0; signal_info[i].sig != -1; i++)
if (lc_signal == signal_info[i].sig)
break;
! semsg("E368: got SIG%s in libcall()", signal_info[i].name);
}
# endif
# endif
--- 7575,7581 ----
for (i = 0; signal_info[i].sig != -1; i++)
if (lc_signal == signal_info[i].sig)
break;
! semsg(e_got_sig_str_in_libcall, signal_info[i].name);
}
# endif
# endif
*** ../vim-8.2.3984/src/os_win32.c 2022-01-01 14:19:44.052353829 +0000
--- src/os_win32.c 2022-01-02 17:56:16.518370809 +0000
***************
*** 4954,4960 ****
# ifdef VIMDLL
if (gui.in_use)
# endif
! emsg(_("E371: Command not found"));
#endif
}

--- 4954,4960 ----
# ifdef VIMDLL
if (gui.in_use)
# endif
! emsg(_(e_command_not_found));
#endif
}

*** ../vim-8.2.3984/src/quickfix.c 2022-01-01 15:58:19.118486361 +0000
--- src/quickfix.c 2022-01-02 18:02:19.093607803 +0000
***************
*** 268,274 ****
if (efminfo->addr[idx])
{
// Each errorformat pattern can occur only once
! semsg(_("E372: Too many %%%c in format string"), *efmpat);
return NULL;
}
if ((idx && idx < 6
--- 268,274 ----
if (efminfo->addr[idx])
{
// Each errorformat pattern can occur only once
! semsg(_(e_too_many_chr_in_format_string), *efmpat);
return NULL;
}
if ((idx && idx < 6
***************
*** 276,282 ****
|| (idx == 6
&& vim_strchr((char_u *)"OPQ", efminfo->prefix) == NULL))
{
! semsg(_("E373: Unexpected %%%c in format string"), *efmpat);
return NULL;
}
efminfo->addr[idx] = (char_u)++round;
--- 276,282 ----
|| (idx == 6
&& vim_strchr((char_u *)"OPQ", efminfo->prefix) == NULL))
{
! semsg(_(e_unexpected_chr_in_format_str), *efmpat);
return NULL;
}
efminfo->addr[idx] = (char_u)++round;
***************
*** 351,357 ****
// skip ;
if (efmp == efm + len)
{
! emsg(_("E374: Missing ] in format string"));
return NULL;
}
}
--- 351,357 ----
// skip ;
if (efmp == efm + len)
{
! emsg(_(e_missing_rsb_in_format_string));
return NULL;
}
}
***************
*** 364,370 ****
else
{
// TODO: scanf()-like: %*ud, %*3c, %*f, ... ?
! semsg(_("E375: Unsupported %%%c in format string"), *efmp);
return NULL;
}

--- 364,370 ----
else
{
// TODO: scanf()-like: %*ud, %*3c, %*f, ... ?
! semsg(_(e_unsupported_chr_in_format_string), *efmp);
return NULL;
}

***************
*** 385,391 ****
efminfo->prefix = *efmp;
else
{
! semsg(_("E376: Invalid %%%c in format string prefix"), *efmp);
return NULL;
}

--- 385,391 ----
efminfo->prefix = *efmp;
else
{
! semsg(_(e_invalid_chr_in_format_string_prefix), *efmp);
return NULL;
}

***************
*** 452,458 ****
}
else
{
! semsg(_("E377: Invalid %%%c in format string"), *efmp);
return FAIL;
}
}
--- 452,458 ----
}
else
{
! semsg(_(e_invalid_chr_in_format_string), *efmp);
return FAIL;
}
}
***************
*** 573,579 ****
}

if (fmt_first == NULL) // nothing found
! emsg(_("E378: 'errorformat' contains no pattern"));

goto parse_efm_end;

--- 573,579 ----
}

if (fmt_first == NULL) // nothing found
! emsg(_(e_errorformat_contains_no_pattern));

goto parse_efm_end;

***************
*** 1273,1279 ****
{
if (*fields->namebuf == NUL)
{
! emsg(_("E379: Missing or empty directory name"));
return QF_FAIL;
}
qfl->qf_directory =
--- 1273,1279 ----
{
if (*fields->namebuf == NUL)
{
! emsg(_(e_missing_or_empty_directory_name));
return QF_FAIL;
}
qfl->qf_directory =
***************
*** 3787,3793 ****
{
if (qi->qf_curlist == 0)
{
! emsg(_("E380: At bottom of quickfix stack"));
break;
}
--qi->qf_curlist;
--- 3787,3793 ----
{
if (qi->qf_curlist == 0)
{
! emsg(_(e_at_bottom_of_quickfix_stack));
break;
}
--qi->qf_curlist;
***************
*** 3796,3802 ****
{
if (qi->qf_curlist >= qi->qf_listcount - 1)
{
! emsg(_("E381: At top of quickfix stack"));
break;
}
++qi->qf_curlist;
--- 3796,3802 ----
{
if (qi->qf_curlist >= qi->qf_listcount - 1)
{
! emsg(_(e_at_top_of_quickfix_stack));
break;
}
++qi->qf_curlist;
*** ../vim-8.2.3984/src/regexp.c 2021-12-30 14:49:39.953445531 +0000
--- src/regexp.c 2022-01-02 17:52:22.670678612 +0000
***************
*** 66,72 ****
#define EMSG2_RET_NULL(m, c) return (semsg((const char *)(m), (c) ? "" : "\\"), rc_did_emsg = TRUE, (void *)NULL)
#define EMSG3_RET_NULL(m, c, a) return (semsg((const char *)(m), (c) ? "" : "\\", (a)), rc_did_emsg = TRUE, (void *)NULL)
#define EMSG2_RET_FAIL(m, c) return (semsg((const char *)(m), (c) ? "" : "\\"), rc_did_emsg = TRUE, FAIL)
! #define EMSG_ONE_RET_NULL EMSG2_RET_NULL(_("E369: invalid item in %s%%[]"), reg_magic == MAGIC_ALL)


#define MAX_LIMIT (32767L << 16L)
--- 66,72 ----
#define EMSG2_RET_NULL(m, c) return (semsg((const char *)(m), (c) ? "" : "\\"), rc_did_emsg = TRUE, (void *)NULL)
#define EMSG3_RET_NULL(m, c, a) return (semsg((const char *)(m), (c) ? "" : "\\", (a)), rc_did_emsg = TRUE, (void *)NULL)
#define EMSG2_RET_FAIL(m, c) return (semsg((const char *)(m), (c) ? "" : "\\"), rc_did_emsg = TRUE, FAIL)
! #define EMSG_ONE_RET_NULL EMSG2_RET_NULL(_(e_invalid_item_in_str_brackets), reg_magic == MAGIC_ALL)


#define MAX_LIMIT (32767L << 16L)
*** ../vim-8.2.3984/src/register.c 2021-12-28 20:59:51.979937080 +0000
--- src/register.c 2022-01-02 17:48:37.810966588 +0000
***************
*** 1691,1697 ****

if (y_size == 0 || y_array == NULL)
{
! semsg(_("E353: Nothing in register %s"),
regname == 0 ? (char_u *)"\"" : transchar(regname));
goto end;
}
--- 1691,1697 ----

if (y_size == 0 || y_array == NULL)
{
! semsg(_(e_nothing_in_register_str),
regname == 0 ? (char_u *)"\"" : transchar(regname));
goto end;
}
*** ../vim-8.2.3984/src/search.c 2022-01-01 16:20:56.900401501 +0000
--- src/search.c 2022-01-02 18:17:01.303784412 +0000
***************
*** 655,661 ****
(options & (SEARCH_HIS + SEARCH_KEEP)), &regmatch) == FAIL)
{
if ((options & SEARCH_MSG) && !rc_did_emsg)
! semsg(_("E383: Invalid search string: %s"), mr_pattern);
return FAIL;
}

--- 655,661 ----
(options & (SEARCH_HIS + SEARCH_KEEP)), &regmatch) == FAIL)
{
if ((options & SEARCH_MSG) && !rc_did_emsg)
! semsg(_(e_invalid_search_string_str), mr_pattern);
return FAIL;
}

***************
*** 1126,1136 ****
if (p_ws)
semsg(_(e_pattern_not_found_str), mr_pattern);
else if (lnum == 0)
! semsg(_("E384: search hit TOP without match for: %s"),
! mr_pattern);
else
! semsg(_("E385: search hit BOTTOM without match for: %s"),
! mr_pattern);
}
return FAIL;
}
--- 1126,1134 ----
if (p_ws)
semsg(_(e_pattern_not_found_str), mr_pattern);
else if (lnum == 0)
! semsg(_(e_search_hit_top_without_match_for_str), mr_pattern);
else
! semsg(_(e_search_hit_bottom_without_match_for_str), mr_pattern);
}
return FAIL;
}
***************
*** 1646,1652 ****
if (dirc != '?' && dirc != '/')
{
retval = 0;
! emsg(_("E386: Expected '?' or '/' after ';'"));
goto end_do_search;
}
++pat;
--- 1644,1650 ----
if (dirc != '?' && dirc != '/')
{
retval = 0;
! emsg(_(e_expected_question_or_slash_after_semicolon));
goto end_do_search;
}
++pat;
***************
*** 3832,3838 ****
&& g_do_tagpreview == 0
#endif
)
! emsg(_("E387: Match is on current line"));
else if (action == ACTION_SHOW)
{
show_pat_in_path(line, type, did_show, action,
--- 3830,3836 ----
&& g_do_tagpreview == 0
#endif
)
! emsg(_(e_match_is_on_current_line));
else if (action == ACTION_SHOW)
{
show_pat_in_path(line, type, did_show, action,
***************
*** 3992,4000 ****
if (got_int || ins_compl_interrupted())
emsg(_(e_interrupted));
else if (type == FIND_DEFINE)
! emsg(_("E388: Couldn't find definition"));
else
! emsg(_("E389: Couldn't find pattern"));
}
if (action == ACTION_SHOW || action == ACTION_SHOW_ALL)
msg_end();
--- 3990,3998 ----
if (got_int || ins_compl_interrupted())
emsg(_(e_interrupted));
else if (type == FIND_DEFINE)
! emsg(_(e_couldnt_find_definition));
else
! emsg(_(e_couldnt_find_pattern));
}
if (action == ACTION_SHOW || action == ACTION_SHOW_ALL)
msg_end();
*** ../vim-8.2.3984/src/syntax.c 2022-01-01 14:19:44.056353820 +0000
--- src/syntax.c 2022-01-02 19:11:19.508406970 +0000
***************
*** 30,37 ****
static char *(spo_name_tab[SPO_COUNT]) =
{"ms=", "me=", "hs=", "he=", "rs=", "re=", "lc="};

- static char e_illegal_arg[] = N_("E390: Illegal argument: %s");
-
/*
* The patterns that are being searched for are stored in a syn_pattern.
* A match item consists of one pattern.
--- 30,35 ----
***************
*** 3340,3346 ****
else if (STRNICMP(arg, "off", 3) == 0 && next - arg == 3)
curwin->w_s->b_syn_conceal = FALSE;
else
! semsg(_(e_illegal_arg), arg);
#endif
}

--- 3338,3344 ----
else if (STRNICMP(arg, "off", 3) == 0 && next - arg == 3)
curwin->w_s->b_syn_conceal = FALSE;
else
! semsg(_(e_illegal_argument_str_2), arg);
#endif
}

***************
*** 3370,3376 ****
else if (STRNICMP(arg, "ignore", 6) == 0 && next - arg == 6)
curwin->w_s->b_syn_ic = TRUE;
else
! semsg(_(e_illegal_arg), arg);
}

/*
--- 3368,3374 ----
else if (STRNICMP(arg, "ignore", 6) == 0 && next - arg == 6)
curwin->w_s->b_syn_ic = TRUE;
else
! semsg(_(e_illegal_argument_str_2), arg);
}

/*
***************
*** 3404,3417 ****
curwin->w_s->b_syn_foldlevel = SYNFLD_MINIMUM;
else
{
! semsg(_(e_illegal_arg), arg);
return;
}

arg = skipwhite(arg_end);
if (*arg != NUL)
{
! semsg(_(e_illegal_arg), arg);
}
}

--- 3402,3415 ----
curwin->w_s->b_syn_foldlevel = SYNFLD_MINIMUM;
else
{
! semsg(_(e_illegal_argument_str_2), arg);
return;
}

arg = skipwhite(arg_end);
if (*arg != NUL)
{
! semsg(_(e_illegal_argument_str_2), arg);
}
}

***************
*** 3446,3452 ****
curwin->w_s->b_syn_spell = SYNSPL_DEFAULT;
else
{
! semsg(_(e_illegal_arg), arg);
return;
}

--- 3444,3450 ----
curwin->w_s->b_syn_spell = SYNSPL_DEFAULT;
else
{
! semsg(_(e_illegal_argument_str_2), arg);
return;
}

***************
*** 3703,3709 ****
id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
if (id == 0)
{
! semsg(_("E391: No such syntax cluster: %s"), arg);
break;
}
else
--- 3701,3707 ----
id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
if (id == 0)
{
! semsg(_(e_no_such_syntax_cluster_1), arg);
break;
}
else
***************
*** 3913,3919 ****
{
id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
if (id == 0)
! semsg(_("E392: No such syntax cluster: %s"), arg);
else
syn_list_cluster(id - SYNID_CLUSTER);
}
--- 3911,3917 ----
{
id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
if (id == 0)
! semsg(_(e_no_such_syntax_cluster_2), arg);
else
syn_list_cluster(id - SYNID_CLUSTER);
}
***************
*** 4600,4606 ****
{
if (!opt->has_cont_list)
{
! emsg(_("E395: contains argument not accepted here"));
return NULL;
}
if (get_id_list(&arg, 8, &opt->cont_list, skip) == FAIL)
--- 4598,4604 ----
{
if (!opt->has_cont_list)
{
! emsg(_(e_contains_argument_not_accepted_here));
return NULL;
}
if (get_id_list(&arg, 8, &opt->cont_list, skip) == FAIL)
***************
*** 4653,4659 ****
{
if (opt->sync_idx == NULL)
{
! emsg(_("E393: group[t]here not accepted here"));
return NULL;
}
gname_start = arg;
--- 4651,4657 ----
{
if (opt->sync_idx == NULL)
{
! emsg(_(e_groupthere_not_accepted_here));
return NULL;
}
gname_start = arg;
***************
*** 4678,4684 ****
}
if (i < 0)
{
! semsg(_("E394: Didn't find region item for %s"), gname);
vim_free(gname);
return NULL;
}
--- 4676,4682 ----
}
if (i < 0)
{
! semsg(_(e_didnt_find_region_item_for_str), gname);
vim_free(gname);
return NULL;
}
***************
*** 4751,4757 ****
rest = get_group_name(arg, &group_name_end);
if (rest == NULL)
{
! emsg(_("E397: Filename required"));
return;
}
sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
--- 4749,4755 ----
rest = get_group_name(arg, &group_name_end);
if (rest == NULL)
{
! emsg(_(e_filename_required));
return;
}
sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
***************
*** 5133,5139 ****
if (*rest != '=')
{
rest = NULL;
! semsg(_("E398: Missing '=': %s"), arg);
break;
}
rest = skipwhite(rest + 1);
--- 5131,5137 ----
if (*rest != '=')
{
rest = NULL;
! semsg(_(e_missing_equal_str), arg);
break;
}
rest = skipwhite(rest + 1);
***************
*** 5296,5302 ****
vim_free(syn_opt_arg.cont_in_list);
vim_free(syn_opt_arg.next_list);
if (not_enough)
! semsg(_("E399: Not enough arguments: syntax region %s"), arg);
else if (illegal || rest == NULL)
semsg(_(e_invalid_argument_str), arg);
}
--- 5294,5300 ----
vim_free(syn_opt_arg.cont_in_list);
vim_free(syn_opt_arg.next_list);
if (not_enough)
! semsg(_(e_not_enough_arguments_syntax_region_str), arg);
else if (illegal || rest == NULL)
semsg(_(e_invalid_argument_str), arg);
}
***************
*** 5626,5632 ****
}

if (!got_clstr)
! emsg(_("E400: No cluster specified"));
if (rest == NULL || !ends_excmd2(eap->cmd, rest))
semsg(_(e_invalid_argument_str), arg);
}
--- 5624,5630 ----
}

if (!got_clstr)
! emsg(_(e_no_cluster_specified));
if (rest == NULL || !ends_excmd2(eap->cmd, rest))
semsg(_(e_invalid_argument_str), arg);
}
***************
*** 5661,5667 ****
end = skip_regexp(arg + 1, *arg, TRUE);
if (*end != *arg) // end delimiter not found
{
! semsg(_("E401: Pattern delimiter not found: %s"), arg);
return NULL;
}
// store the pattern and compiled regexp program
--- 5659,5665 ----
end = skip_regexp(arg + 1, *arg, TRUE);
if (*end != *arg) // end delimiter not found
{
! semsg(_(e_pattern_delimiter_not_found_str), arg);
return NULL;
}
// store the pattern and compiled regexp program
***************
*** 5739,5745 ****

if (!ends_excmd2(arg, end) && !VIM_ISWHITE(*end))
{
! semsg(_("E402: Garbage after pattern: %s"), arg);
return NULL;
}
return skipwhite(end);
--- 5737,5743 ----

if (!ends_excmd2(arg, end) && !VIM_ISWHITE(*end))
{
! semsg(_(e_garbage_after_pattern_str), arg);
return NULL;
}
return skipwhite(end);
***************
*** 5833,5839 ****
}
if (curwin->w_s->b_syn_linecont_pat != NULL)
{
! emsg(_("E403: syntax sync: line continuations pattern specified twice"));
finished = TRUE;
break;
}
--- 5831,5837 ----
}
if (curwin->w_s->b_syn_linecont_pat != NULL)
{
! emsg(_(e_syntax_sync_line_continuations_pattern_specified_twice));
finished = TRUE;
break;
}
***************
*** 5893,5899 ****
}
vim_free(key);
if (illegal)
! semsg(_("E404: Illegal arguments: %s"), arg_start);
else if (!finished)
{
set_nextcmd(eap, arg_start);
--- 5891,5897 ----
}
vim_free(key);
if (illegal)
! semsg(_(e_illegal_arguments_str), arg_start);
else if (!finished)
{
set_nextcmd(eap, arg_start);
***************
*** 5944,5956 ****
p = skipwhite(*arg + keylen);
if (*p != '=')
{
! semsg(_("E405: Missing equal sign: %s"), *arg);
break;
}
p = skipwhite(p + 1);
if (ends_excmd2(*arg, p))
{
! semsg(_("E406: Empty argument: %s"), *arg);
break;
}

--- 5942,5954 ----
p = skipwhite(*arg + keylen);
if (*p != '=')
{
! semsg(_(e_missing_equal_sign_str), *arg);
break;
}
p = skipwhite(p + 1);
if (ends_excmd2(*arg, p))
{
! semsg(_(e_empty_argument_str), *arg);
break;
}

***************
*** 5976,5990 ****
{
if (TOUPPER_ASC(**arg) != 'C')
{
! semsg(_("E407: %s not allowed here"), name + 1);
failed = TRUE;
vim_free(name);
break;
}
if (count != 0)
{
! semsg(_("E408: %s must be first in contains list"),
! name + 1);
failed = TRUE;
vim_free(name);
break;
--- 5974,5987 ----
{
if (TOUPPER_ASC(**arg) != 'C')
{
! semsg(_(e_str_not_allowed_here), name + 1);
failed = TRUE;
vim_free(name);
break;
}
if (count != 0)
{
! semsg(_(e_str_must_be_first_in_contains_list), name + 1);
failed = TRUE;
vim_free(name);
break;
***************
*** 6062,6068 ****
vim_free(name);
if (id == 0)
{
! semsg(_("E409: Unknown group name: %s"), p);
failed = TRUE;
break;
}
--- 6059,6065 ----
vim_free(name);
if (id == 0)
{
! semsg(_(e_unknown_group_name_str), p);
failed = TRUE;
break;
}
***************
*** 6298,6304 ****
{
if (subcommands[i].name == NULL)
{
! semsg(_("E410: Invalid :syntax subcommand: %s"), subcmd_name);
break;
}
if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0)
--- 6295,6301 ----
{
if (subcommands[i].name == NULL)
{
! semsg(_(e_invalid_syntax_subcommand_str), subcmd_name);
break;
}
if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0)
*** ../vim-8.2.3984/src/tag.c 2022-01-01 14:19:44.056353820 +0000
--- src/tag.c 2022-01-02 19:00:52.622036841 +0000
***************
*** 510,516 ****
cur_match = MAXCOL - 1;
else if (cur_match < 0)
{
! emsg(_("E425: Cannot go before first matching tag"));
skip_msg = TRUE;
cur_match = 0;
cur_fnum = curbuf->b_fnum;
--- 510,516 ----
cur_match = MAXCOL - 1;
else if (cur_match < 0)
{
! emsg(_(e_cannot_go_before_first_matching_tag));
skip_msg = TRUE;
cur_match = 0;
cur_fnum = curbuf->b_fnum;
***************
*** 665,671 ****
if (num_matches <= 0)
{
if (verbose)
! semsg(_("E426: tag not found: %s"), name);
#if defined(FEAT_QUICKFIX)
g_do_tagpreview = 0;
#endif
--- 665,671 ----
if (num_matches <= 0)
{
if (verbose)
! semsg(_(e_tag_not_found_str), name);
#if defined(FEAT_QUICKFIX)
g_do_tagpreview = 0;
#endif
***************
*** 732,740 ****
&& nofile_fname == NULL)
{
if (num_matches == 1)
! emsg(_("E427: There is only one matching tag"));
else
! emsg(_("E428: Cannot go beyond last matching tag"));
skip_msg = TRUE;
}
cur_match = num_matches - 1;
--- 732,740 ----
&& nofile_fname == NULL)
{
if (num_matches == 1)
! emsg(_(e_there_is_only_one_matching_tag));
else
! emsg(_(e_cannot_go_beyond_last_matching_tag));
skip_msg = TRUE;
}
cur_match = num_matches - 1;
***************
*** 842,848 ****
}
continue;
}
! semsg(_("E429: File \"%s\" does not exist"), nofile_fname);
}
else
{
--- 842,848 ----
}
continue;
}
! semsg(_(e_file_str_does_not_exist), nofile_fname);
}
else
{
***************
*** 2166,2172 ****
if (fp != NULL)
{
if (STRLEN(fullpath_ebuf) > LSIZE)
! semsg(_("E430: Tag file path truncated for %s\n"), ebuf);
vim_strncpy(tag_fname, fullpath_ebuf,
MAXPATHL);
++incstack_idx;
--- 2166,2172 ----
if (fp != NULL)
{
if (STRLEN(fullpath_ebuf) > LSIZE)
! semsg(_(e_tag_file_path_truncated_for_str), ebuf);
vim_strncpy(tag_fname, fullpath_ebuf,
MAXPATHL);
++incstack_idx;
***************
*** 2758,2764 ****

if (line_error)
{
! semsg(_("E431: Format error in tags file \"%s\""), tag_fname);
#ifdef FEAT_CSCOPE
if (!use_cscope)
#endif
--- 2758,2764 ----

if (line_error)
{
! semsg(_(e_format_error_in_tags_file_str), tag_fname);
#ifdef FEAT_CSCOPE
if (!use_cscope)
#endif
***************
*** 2786,2792 ****
tag_file_sorted = NUL;
if (sort_error)
{
! semsg(_("E432: Tags file not sorted: %s"), tag_fname);
sort_error = FALSE;
}
#endif
--- 2786,2792 ----
tag_file_sorted = NUL;
if (sort_error)
{
! semsg(_(e_tags_file_not_sorted_str), tag_fname);
sort_error = FALSE;
}
#endif
***************
*** 2830,2836 ****
if (!stop_searching)
{
if (!did_open && verbose) // never opened any tags file
! emsg(_("E433: No tags file"));
retval = OK; // It's OK even when no tag found
}

--- 2830,2836 ----
if (!stop_searching)
{
if (!did_open && verbose) // never opened any tags file
! emsg(_(e_no_tags_file));
retval = OK; // It's OK even when no tag found
}

***************
*** 3656,3662 ****
}
if (found == 0)
{
! emsg(_("E434: Can't find tag pattern"));
curwin->w_cursor.lnum = save_lnum;
}
else
--- 3656,3662 ----
}
if (found == 0)
{
! emsg(_(e_canot_find_tag_pattern));
curwin->w_cursor.lnum = save_lnum;
}
else
***************
*** 3667,3673 ****
*/
if (found == 2 || !save_p_ic)
{
! msg(_("E435: Couldn't find tag, just guessing!"));
if (!msg_scrolled && msg_silent == 0)
{
out_flush();
--- 3667,3673 ----
*/
if (found == 2 || !save_p_ic)
{
! msg(_(e_couldnt_find_tag_just_guessing));
if (!msg_scrolled && msg_silent == 0)
{
out_flush();
*** ../vim-8.2.3984/src/term.c 2021-12-27 17:21:38.020449109 +0000
--- src/term.c 2022-01-02 19:01:43.957937931 +0000
***************
*** 2384,2390 ****
emsg(error_msg);
else
#endif
! semsg(_("E436: No \"%s\" entry in termcap"), name);
}
return FAIL;
}
--- 2384,2390 ----
emsg(error_msg);
else
#endif
! semsg(_(e_no_str_entry_in_termcap), name);
}
return FAIL;
}
***************
*** 3161,3167 ****
* MUST have "cm": cursor motion.
*/
if (*T_CM == NUL)
! emsg(_("E437: terminal capability \"cm\" required"));

/*
* if "cs" defined, use a scroll region, it's faster.
--- 3161,3167 ----
* MUST have "cm": cursor motion.
*/
if (*T_CM == NUL)
! emsg(_(e_terminal_capability_cm_required));

/*
* if "cs" defined, use a scroll region, it's faster.
*** ../vim-8.2.3984/src/typval.c 2022-01-01 16:01:17.814226087 +0000
--- src/typval.c 2022-01-02 17:52:59.546630538 +0000
***************
*** 320,326 ****
emsg(_("E894: Using a Dictionary as a Float"));
break;
case VAR_BOOL:
! emsg(_("E362: Using a boolean value as a Float"));
break;
case VAR_SPECIAL:
emsg(_("E907: Using a special value as a Float"));
--- 320,326 ----
emsg(_("E894: Using a Dictionary as a Float"));
break;
case VAR_BOOL:
! emsg(_(e_using_boolean_valud_as_float));
break;
case VAR_SPECIAL:
emsg(_("E907: Using a special value as a Float"));
*** ../vim-8.2.3984/src/undo.c 2022-01-01 15:58:19.118486361 +0000
--- src/undo.c 2022-01-02 19:04:40.793600069 +0000
***************
*** 2713,2719 ****
|| bot > curbuf->b_ml.ml_line_count + 1)
{
unblock_autocmds();
! iemsg(_("E438: u_undo: line numbers wrong"));
changed(); // don't want UNCHANGED now
return;
}
--- 2713,2719 ----
|| bot > curbuf->b_ml.ml_line_count + 1)
{
unblock_autocmds();
! iemsg(_(e_u_undo_line_numbers_wrong));
changed(); // don't want UNCHANGED now
return;
}
***************
*** 3285,3291 ****
{
if (curbuf->b_u_newhead == NULL || curbuf->b_u_newhead->uh_entry == NULL)
{
! iemsg(_("E439: undo list corrupt"));
return NULL;
}
return curbuf->b_u_newhead->uh_entry;
--- 3285,3291 ----
{
if (curbuf->b_u_newhead == NULL || curbuf->b_u_newhead->uh_entry == NULL)
{
! iemsg(_(e_undo_list_corrupt));
return NULL;
}
return curbuf->b_u_newhead->uh_entry;
***************
*** 3317,3323 ****
uep->ue_bot = uep->ue_top + uep->ue_size + 1 + extra;
if (uep->ue_bot < 1 || uep->ue_bot > curbuf->b_ml.ml_line_count)
{
! iemsg(_("E440: undo line missing"));
uep->ue_bot = uep->ue_top + 1; // assume all lines deleted, will
// get all the old lines back
// without deleting the current
--- 3317,3323 ----
uep->ue_bot = uep->ue_top + uep->ue_size + 1 + extra;
if (uep->ue_bot < 1 || uep->ue_bot > curbuf->b_ml.ml_line_count)
{
! iemsg(_(e_undo_line_missing));
uep->ue_bot = uep->ue_top + 1; // assume all lines deleted, will
// get all the old lines back
// without deleting the current
*** ../vim-8.2.3984/src/window.c 2022-01-01 19:33:46.773076795 +0000
--- src/window.c 2022-01-02 19:07:05.465326293 +0000
***************
*** 260,266 ****
if (wp->w_p_pvw)
break;
if (wp == NULL)
! emsg(_("E441: There is no preview window"));
else
win_goto(wp);
break;
--- 260,266 ----
if (wp->w_p_pvw)
break;
if (wp == NULL)
! emsg(_(e_there_is_no_preview_window));
else
win_goto(wp);
break;
***************
*** 817,823 ****
flags |= cmdmod.cmod_split;
if ((flags & WSP_TOP) && (flags & WSP_BOT))
{
! emsg(_("E442: Can't split topleft and botright at the same time"));
return FAIL;
}

--- 817,823 ----
flags |= cmdmod.cmod_split;
if ((flags & WSP_TOP) && (flags & WSP_BOT))
{
! emsg(_(e_cant_split_topleft_and_botright_at_the_same_time));
return FAIL;
}

***************
*** 1721,1727 ****
FOR_ALL_FRAMES(frp, curwin->w_frame->fr_parent->fr_child)
if (frp->fr_win == NULL)
{
! emsg(_("E443: Cannot rotate when another window is split"));
return;
}

--- 1721,1727 ----
FOR_ALL_FRAMES(frp, curwin->w_frame->fr_parent->fr_child)
if (frp->fr_win == NULL)
{
! emsg(_(e_cannot_rotate_when_another_window_is_split));
return;
}

***************
*** 2487,2493 ****

if (last_window())
{
! emsg(_("E444: Cannot close last window"));
return FAIL;
}

--- 2487,2493 ----

if (last_window())
{
! emsg(_(e_cannot_close_last_window));
return FAIL;
}

***************
*** 3663,3669 ****
}

if (message && !ONE_WINDOW)
! emsg(_("E445: Other window contains changes"));
}

static void
--- 3663,3669 ----
}

if (message && !ONE_WINDOW)
! emsg(_(e_other_window_contains_changes));
}

static void
***************
*** 4485,4491 ****
return;
if (popup_is_popup(wp))
{
! emsg(_("E366: Not allowed to enter a popup window"));
return;
}
#endif
--- 4485,4491 ----
return;
if (popup_is_popup(wp))
{
! emsg(_(e_not_allowed_to_enter_popup_window));
return;
}
#endif
*** ../vim-8.2.3984/src/version.c 2022-01-02 17:28:52.672030191 +0000
--- src/version.c 2022-01-02 19:24:32.834197340 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 3985,
/**/

--
% cat /usr/include/sys/errno.h
#define EPERM 1 /* Operation not permitted */
#define ENOENT 2 /* No such file or directory */
#define ESRCH 3 /* No such process */
[...]
#define EMACS 666 /* Too many macros */
%

/// Bram Moolenaar -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages