Patch 8.2.4046

[Bram Moolenaar]

Patch 8.2.4046
Problem: Some error messages not in the right place.
Solution: Adjust the errors file. Fix typo.
Files: src/errors.h, src/regexp_bt.c, src/typval.c,


*** ../vim-8.2.4045/src/errors.h 2022-01-08 17:03:51.600942321 +0000
--- src/errors.h 2022-01-08 21:10:24.062439351 +0000
***************
*** 23,28 ****
--- 23,29 ----
INIT(= N_("E12: Command not allowed from exrc/vimrc in current dir or tag search"));
EXTERN char e_file_exists[]
INIT(= N_("E13: File exists (add ! to override)"));
+ // E14 unused
#ifdef FEAT_EVAL
EXTERN char e_invalid_expression_str[]
INIT(= N_("E15: Invalid expression: \"%s\""));
***************
*** 135,140 ****
--- 136,144 ----
INIT(= N_("E54: Unmatched %s("));
EXTERN char e_unmatched_str_close[]
INIT(= N_("E55: Unmatched %s)"));
+ // E56 unused
+ // E57 unused
+ // E58 unused
EXTERN char e_invalid_character_after_str_at[]
INIT(= N_("E59: invalid character after %s@"));
EXTERN char e_too_many_complex_str_curly[]
***************
*** 155,160 ****
--- 159,166 ----
EXTERN char e_z1_z9_not_allowed_here[]
INIT(= N_("E67: \\z1 - \\z9 not allowed here"));
#endif
+ EXTERN char e_invalid_character_after_bsl_z[]
+ INIT(= N_("E68: Invalid character after \\z"));
EXTERN char e_missing_sb_after_str[]
INIT(= N_("E69: Missing ] after %s%%["));
EXTERN char e_empty_str_brackets[]
***************
*** 652,657 ****
--- 658,664 ----
EXTERN char e_unable_to_read_server_reply[]
INIT(= N_("E277: Unable to read a server reply"));
#endif
+ // E278 unused
#ifdef FEAT_TERMINAL
EXTERN char e_sorry_plusplusshell_not_supported_on_this_system[]
INIT(= N_("E279: Sorry, ++shell is not supported on this system"));
***************
*** 840,846 ****
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'"));
--- 847,853 ----
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_value_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'"));
***************
*** 1249,1255 ****
INIT(= N_("E536: comma required"));
EXTERN char e_commentstring_must_be_empty_or_contain_str[]
INIT(= N_("E537: 'commentstring' must be empty or contain %s"));
! // E538 unused (perhaps 538.nl ?)
EXTERN char e_illegal_character_str[]
INIT(= N_("E539: Illegal character <%s>"));
EXTERN char e_unclosed_expression_sequence[]
--- 1256,1262 ----
INIT(= N_("E536: comma required"));
EXTERN char e_commentstring_must_be_empty_or_contain_str[]
INIT(= N_("E537: 'commentstring' must be empty or contain %s"));
! // E538 unused
EXTERN char e_illegal_character_str[]
INIT(= N_("E539: Illegal character <%s>"));
EXTERN char e_unclosed_expression_sequence[]
*** ../vim-8.2.4045/src/regexp_bt.c 2022-01-05 16:08:59.524426437 +0000
--- src/regexp_bt.c 2022-01-08 19:19:43.496508966 +0000
***************
*** 1489,1495 ****
return NULL;
break;

! default: EMSG_RET_NULL(_("E68: Invalid character after \\z"));
}
}
break;
--- 1489,1495 ----
return NULL;
break;

! default: EMSG_RET_NULL(_(e_invalid_character_after_bsl_z));
}
}
break;
*** ../vim-8.2.4045/src/typval.c 2022-01-08 12:41:12.208795550 +0000
--- src/typval.c 2022-01-08 20:34:50.855545400 +0000
***************
*** 320,326 ****
emsg(_(e_using_dictionary_as_float));
break;
case VAR_BOOL:
! emsg(_(e_using_boolean_valud_as_float));
break;
case VAR_SPECIAL:
emsg(_(e_using_special_value_as_float));
--- 320,326 ----
emsg(_(e_using_dictionary_as_float));
break;
case VAR_BOOL:
! emsg(_(e_using_boolean_value_as_float));
break;
case VAR_SPECIAL:
emsg(_(e_using_special_value_as_float));
*** ../vim-8.2.4045/src/version.c 2022-01-08 18:43:36.881446893 +0000
--- src/version.c 2022-01-08 21:36:40.824167022 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4046,
/**/

--
Two fish in a tank. One says to the other:
"Do you know how to drive this thing?"

/// 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 ///