patch 8.2.4046: some error messages not in the right place

Problem:    Some error messages not in the right place.
Solution:   Adjust the errors file.  Fix typo.

diff --git a/src/errors.h b/src/errors.h
index 8e7ffee18df7f76e72fd62b1c3e76443439743d2..1c723acac30ec21a3e0daa152d618c867d27fefa 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -23,6 +23,7 @@ EXTERN char e_command_not_allowed_from_vimrc_in_current_dir_or_tag_search[]
        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,6 +136,9 @@ EXTERN char e_unmatched_str_open[]
        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,6 +159,8 @@ EXTERN char e_z_not_allowed_here[]
 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,6 +658,7 @@ EXTERN char e_cannot_use_function_as_method_str[]
 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,7 +847,7 @@ EXTERN char e_screen_mode_setting_not_supported[]
 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[]
+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,7 +1256,7 @@ EXTERN char e_comma_required[]
        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 ?)
+// E538 unused
 EXTERN char e_illegal_character_str[]
        INIT(= N_("E539: Illegal character <%s>"));
 EXTERN char e_unclosed_expression_sequence[]

diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index 9286d911aeab0aa5232ca43db888e4a0cbe47b9d..aee5c1becb1f1dbb30caea21ab8f89b2bba166c7 100644 (file)
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -1489,7 +1489,7 @@ regatom(int *flagp)
                              return NULL;
                          break;
 
-               default:  EMSG_RET_NULL(_("E68: Invalid character after \\z"));
+               default:  EMSG_RET_NULL(_(e_invalid_character_after_bsl_z));
            }
        }
        break;

diff --git a/src/typval.c b/src/typval.c
index eb0ef77b74ecafc5f361f97dd2d9a97bdbb3ee0e..ab226403dfa08e5e5da1b6dff74e4973a8b670f1 100644 (file)
--- a/src/typval.c
+++ b/src/typval.c
@@ -320,7 +320,7 @@ tv_get_float_chk(typval_T *varp, int *error)
            emsg(_(e_using_dictionary_as_float));
            break;
        case VAR_BOOL:
-           emsg(_(e_using_boolean_valud_as_float));
+           emsg(_(e_using_boolean_value_as_float));
            break;
        case VAR_SPECIAL:
            emsg(_(e_using_special_value_as_float));

diff --git a/src/version.c b/src/version.c
index a1dea1fea009a11fec46a352f8b36f976b1d276f..f2845e21065cd916364aa204ffd2835a43b8d082 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4046,
 /**/
     4045,
 /**/