patch 8.2.3197: error messages are spread out

Problem:    Error messages are spread out.
Solution:   Move a few more error messages to errors.h.

diff --git a/src/edit.c b/src/edit.c
index 5280a82b4acce0baf3ea34afa45ec907a7c3d169..96464ded050b379fc5f1214d570d3d705083f204 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -165,7 +165,7 @@ edit(
     // Don't allow inserting in the sandbox.
     if (sandbox != 0)
     {
-       emsg(_(e_sandbox));
+       emsg(_(e_not_allowed_in_sandbox));
        return FALSE;
     }
 #endif

diff --git a/src/errors.h b/src/errors.h
index ce0d682dd9c15b180c7d4feaf1d3cc36fb6664db..8655d3f455aa831264fab9fb9cf66a941d798319 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -104,10 +104,43 @@ EXTERN char e_corrupted_regexp_program[]
        INIT(= N_("E44: Corrupted regexp program"));
 EXTERN char e_readonly_option_is_set_add_bang_to_override[]
        INIT(= N_("E45: 'readonly' option is set (add ! to override)"));
+#ifdef FEAT_EVAL
+EXTERN char e_cannot_change_readonly_variable_str[]
+       INIT(= N_("E46: Cannot change read-only variable \"%s\""));
+#endif
+#ifdef FEAT_QUICKFIX
+EXTERN char e_error_while_reading_errorfile[]
+       INIT(= N_("E47: Error while reading errorfile"));
+#endif
+#ifdef HAVE_SANDBOX
+EXTERN char e_not_allowed_in_sandbox[]
+       INIT(= N_("E48: Not allowed in sandbox"));
+#endif
+EXTERN char e_invalid_scroll_size[]
+       INIT(= N_("E49: Invalid scroll size"));
+EXTERN char e_too_many_z[]
+       INIT(= N_("E50: Too many \\z("));
+EXTERN char e_too_many_str_open[]
+       INIT(= N_("E51: Too many %s("));
+EXTERN char e_unmatched_z[]
+       INIT(= N_("E52: Unmatched \\z("));
+EXTERN char e_unmatched_str_percent_open[]
+       INIT(= N_("E53: Unmatched %s%%("));
+EXTERN char e_unmatched_str_open[]
+       INIT(= N_("E54: Unmatched %s("));
+EXTERN char e_unmatched_str_close[]
+       INIT(= N_("E55: Unmatched %s)"));
+EXTERN char e_invalid_character_after_str_at[]
+       INIT(= N_("E59: invalid character after %s@"));
+EXTERN char e_too_many_complex_str_curly[]
+       INIT(= N_("E60: Too many complex %s{...}s"));
+
+#ifdef FEAT_EVAL
 EXTERN char e_undefined_variable_str[]
        INIT(= N_("E121: Undefined variable: %s"));
 EXTERN char e_undefined_variable_char_str[]
        INIT(= N_("E121: Undefined variable: %c:%s"));
+#endif
 #ifndef FEAT_DIGRAPHS
 EXTERN char e_no_digraphs_version[]
        INIT(= N_("E196: No digraphs in this version"));

diff --git a/src/evalvars.c b/src/evalvars.c
index 909ee1d2c2550f140873ca0ca864db7e49806c47..c58f73491a5ce2681a4d8c4768f6c83e47875a4a 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2232,7 +2232,7 @@ set_vim_var_tv(int idx, typval_T *tv)
     // VV_RO is also checked when compiling, but let's check here as well.
     if (vimvars[idx].vv_flags & VV_RO)
     {
-       semsg(_(e_readonlyvar), vimvars[idx].vv_name);
+       semsg(_(e_cannot_change_readonly_variable_str), vimvars[idx].vv_name);
        return FAIL;
     }
     if (sandbox && (vimvars[idx].vv_flags & VV_RO_SBX))
@@ -3499,7 +3499,8 @@ var_check_ro(int flags, char_u *name, int use_gettext)
 {
     if (flags & DI_FLAGS_RO)
     {
-       semsg(_(e_readonlyvar), use_gettext ? (char_u *)_(name) : name);
+       semsg(_(e_cannot_change_readonly_variable_str),
+                                      use_gettext ? (char_u *)_(name) : name);
        return TRUE;
     }
     if ((flags & DI_FLAGS_RO_SBX) && sandbox)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 513306bb3102fb32b643eb7a12bb8fffa5060d5a..d9ec4a44b34eeec7739894d9eea4f2914208c7e0 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3596,7 +3596,7 @@ check_secure(void)
      */
     if (sandbox != 0)
     {
-       emsg(_(e_sandbox));
+       emsg(_(e_not_allowed_in_sandbox));
        return TRUE;
     }
 #endif

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 1efefb1fb123de6ce8f242f41be647ac6f19dfd4..c1d0295f4c1469ca0900815016ed8d639884eb34 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2112,7 +2112,7 @@ do_one_cmd(
        if (sandbox != 0 && !(ea.argt & EX_SBOXOK))
        {
            // Command not allowed in sandbox.
-           errormsg = _(e_sandbox);
+           errormsg = _(e_not_allowed_in_sandbox);
            goto doend;
        }
 #endif

diff --git a/src/globals.h b/src/globals.h
index 4c751874b46e845af216219bebe70a71474a564b..00936e82630887e80a24257fbd400abe92299713 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1666,7 +1666,6 @@ EXTERN char e_loclist[]           INIT(= N_("E776: No location list"));
 EXTERN char e_letwrong[]       INIT(= N_("E734: Wrong variable type for %s="));
 EXTERN char e_illvar[]         INIT(= N_("E461: Illegal variable name: %s"));
 EXTERN char e_cannot_mod[]     INIT(= N_("E995: Cannot modify existing variable"));
-EXTERN char e_readonlyvar[]    INIT(= N_("E46: Cannot change read-only variable \"%s\""));
 EXTERN char e_readonlysbx[]    INIT(= N_("E794: Cannot set variable in the sandbox: \"%s\""));
 EXTERN char e_stringreq[]      INIT(= N_("E928: String required"));
 EXTERN char e_numberreq[]      INIT(= N_("E889: Number required"));
@@ -1692,12 +1691,6 @@ EXTERN char e_unknown_option[]   INIT(= N_("E113: Unknown option: %s"));
 EXTERN char e_reduceempty[]    INIT(= N_("E998: Reduce of an empty %s with no initial value"));
 EXTERN char e_no_dict_key[]    INIT(= N_("E857: Dictionary key \"%s\" required"));
 #endif
-#ifdef FEAT_QUICKFIX
-EXTERN char e_readerrf[]       INIT(= N_("E47: Error while reading errorfile"));
-#endif
-#ifdef HAVE_SANDBOX
-EXTERN char e_sandbox[]                INIT(= N_("E48: Not allowed in sandbox"));
-#endif
 EXTERN char e_secure[]         INIT(= N_("E523: Not allowed here"));
 EXTERN char e_textlock[]       INIT(= N_("E578: Not allowed to change text here"));
 EXTERN char e_textwinlock[]    INIT(= N_("E565: Not allowed to change text or change window"));
@@ -1705,7 +1698,6 @@ EXTERN char e_textwinlock[]       INIT(= N_("E565: Not allowed to change text or chang
        || defined(UNIX) || defined(VMS)
 EXTERN char e_screenmode[]     INIT(= N_("E359: Screen mode setting not supported"));
 #endif
-EXTERN char e_scroll[] INIT(= N_("E49: Invalid scroll size"));
 EXTERN char e_shellempty[]     INIT(= N_("E91: 'shell' option is empty"));
 #if defined(FEAT_SIGN_ICONS) && !defined(FEAT_GUI_GTK)
 EXTERN char e_signdata[]       INIT(= N_("E255: Couldn't read in sign data!"));

diff --git a/src/option.c b/src/option.c
index 6232cd96d5491e88e8e00d1c72af2d73e5051157..21d113e27edadbbff2021d98a25798b4db3b452f 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -1485,7 +1485,7 @@ do_set(
            // Disallow changing some options in the sandbox
            if (sandbox != 0 && (flags & P_SECURE))
            {
-               errmsg = e_sandbox;
+               errmsg = e_not_allowed_in_sandbox;
                goto skip;
            }
 #endif
@@ -3757,7 +3757,7 @@ set_num_option(
        if (pp == &(curwin->w_p_scr))
        {
            if (curwin->w_p_scr != 0)
-               errmsg = e_scroll;
+               errmsg = e_invalid_scroll_size;
            win_comp_scroll(curwin);
        }
        // If 'scroll' became invalid because of a side effect silently adjust
@@ -3793,7 +3793,7 @@ set_num_option(
            p_sj = Rows / 2;
        else
        {
-           errmsg = e_scroll;
+           errmsg = e_invalid_scroll_size;
            p_sj = 1;
        }
     }
@@ -4366,7 +4366,7 @@ set_option_value(
        // Disallow changing some options in the sandbox
        if (sandbox > 0 && (flags & P_SECURE))
        {
-           emsg(_(e_sandbox));
+           emsg(_(e_not_allowed_in_sandbox));
            return NULL;
        }
 #endif

diff --git a/src/quickfix.c b/src/quickfix.c
index daf27d702c28bab8c77182869d60018173bb51d7..d1671b23e19702b31600dce82f5540a14be73a39 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1769,7 +1769,7 @@ qf_init_ext(
        retval = qfl->qf_count;
        goto qf_init_end;
     }
-    emsg(_(e_readerrf));
+    emsg(_(e_error_while_reading_errorfile));
 error2:
     if (!adding)
     {

diff --git a/src/regexp.c b/src/regexp.c
index 5a17d24e7bc5fdc147a6fa2e3ae70ecbf5580431..e28d9e69597350a7ddbc99f4adf7ac57c259a1fc 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -74,9 +74,6 @@ toggle_Magic(int x)
 static char_u e_missingbracket[] = N_("E769: Missing ] after %s[");
 static char_u e_reverse_range[] = N_("E944: Reverse range in character class");
 static char_u e_large_class[] = N_("E945: Range too large in character class");
-static char_u e_unmatchedpp[] = N_("E53: Unmatched %s%%(");
-static char_u e_unmatchedp[] = N_("E54: Unmatched %s(");
-static char_u e_unmatchedpar[] = N_("E55: Unmatched %s)");
 #ifdef FEAT_SYN_HL
 static char_u e_z_not_allowed[] = N_("E66: \\z( not allowed here");
 static char_u e_z1_not_allowed[] = N_("E67: \\z1 - \\z9 not allowed here");

diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index 1a677d19c1bd62c1a149c3a5b8c02c835f3e83ac..313451ccbca4f496d0c9989d3e9549af1bff527e 100644 (file)
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -2158,7 +2158,7 @@ regpiece(int *flagp)
                              }
                }
                if (lop == END)
-                   EMSG2_RET_NULL(_("E59: invalid character after %s@"),
+                   EMSG2_RET_NULL(_(e_invalid_character_after_str_at),
                                                      reg_magic == MAGIC_ALL);
                // Look behind must match with behind_pos.
                if (lop == BEHIND || lop == NOBEHIND)
@@ -2199,7 +2199,7 @@ regpiece(int *flagp)
            else
            {
                if (num_complex_braces >= 10)
-                   EMSG2_RET_NULL(_("E60: Too many complex %s{...}s"),
+                   EMSG2_RET_NULL(_(e_too_many_complex_str_curly),
                                                      reg_magic == MAGIC_ALL);
                reginsert(BRACE_COMPLEX + num_complex_braces, ret);
                regoptail(ret, regnode(BACK));
@@ -2369,7 +2369,7 @@ reg(
     {
        // Make a ZOPEN node.
        if (regnzpar >= NSUBEXP)
-           EMSG_RET_NULL(_("E50: Too many \\z("));
+           EMSG_RET_NULL(_(e_too_many_z));
        parno = regnzpar;
        regnzpar++;
        ret = regnode(ZOPEN + parno);
@@ -2380,7 +2380,7 @@ reg(
     {
        // Make a MOPEN node.
        if (regnpar >= NSUBEXP)
-           EMSG2_RET_NULL(_("E51: Too many %s("), reg_magic == MAGIC_ALL);
+           EMSG2_RET_NULL(_(e_too_many_str_open), reg_magic == MAGIC_ALL);
        parno = regnpar;
        ++regnpar;
        ret = regnode(MOPEN + parno);
@@ -2437,18 +2437,18 @@ reg(
     {
 #ifdef FEAT_SYN_HL
        if (paren == REG_ZPAREN)
-           EMSG_RET_NULL(_("E52: Unmatched \\z("));
+           EMSG_RET_NULL(_(e_unmatched_z));
        else
 #endif
            if (paren == REG_NPAREN)
-           EMSG2_RET_NULL(_(e_unmatchedpp), reg_magic == MAGIC_ALL);
+           EMSG2_RET_NULL(_(e_unmatched_str_percent_open), reg_magic == MAGIC_ALL);
        else
-           EMSG2_RET_NULL(_(e_unmatchedp), reg_magic == MAGIC_ALL);
+           EMSG2_RET_NULL(_(e_unmatched_str_open), reg_magic == MAGIC_ALL);
     }
     else if (paren == REG_NOPAREN && peekchr() != NUL)
     {
        if (curchr == Magic(')'))
-           EMSG2_RET_NULL(_(e_unmatchedpar), reg_magic == MAGIC_ALL);
+           EMSG2_RET_NULL(_(e_unmatched_str_close), reg_magic == MAGIC_ALL);
        else
            EMSG_RET_NULL(_(e_trailing));       // "Can't happen".
        // NOTREACHED

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index dac31252887ffdd92307805a040591a99f6e7e2f..9757d7c4755234524fda5e7c2c6e95c12f39f4f7 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2561,14 +2561,15 @@ nfa_reg(
     if (paren != REG_NOPAREN && getchr() != Magic(')'))
     {
        if (paren == REG_NPAREN)
-           EMSG2_RET_FAIL(_(e_unmatchedpp), reg_magic == MAGIC_ALL);
+           EMSG2_RET_FAIL(_(e_unmatched_str_percent_open),
+                                                      reg_magic == MAGIC_ALL);
        else
-           EMSG2_RET_FAIL(_(e_unmatchedp), reg_magic == MAGIC_ALL);
+           EMSG2_RET_FAIL(_(e_unmatched_str_open), reg_magic == MAGIC_ALL);
     }
     else if (paren == REG_NOPAREN && peekchr() != NUL)
     {
        if (peekchr() == Magic(')'))
-           EMSG2_RET_FAIL(_(e_unmatchedpar), reg_magic == MAGIC_ALL);
+           EMSG2_RET_FAIL(_(e_unmatched_str_close), reg_magic == MAGIC_ALL);
        else
            EMSG_RET_FAIL(_("E873: (NFA regexp) proper termination error"));
     }

diff --git a/src/undo.c b/src/undo.c
index c16bcacded907cf7fabc0d3f1d5f15eaf0474465..331c1e676bae5109b1e45c5e54969cd371bb2fed 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -324,7 +324,7 @@ undo_allowed(void)
     // In the sandbox it's not allowed to change the text.
     if (sandbox != 0)
     {
-       emsg(_(e_sandbox));
+       emsg(_(e_not_allowed_in_sandbox));
        return FALSE;
     }
 #endif

diff --git a/src/version.c b/src/version.c
index fa86ff628187972b79fc9cf5d1e55faadd3c7c1b..027de07b3f63b67d6c7f37e3fee0e48f04d8d99c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3197,
 /**/
     3196,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 2a0ab2528d0965e27abb06bbe62006a7876a9097..8e8ae3f98ed477106ed031b25e3787aa96961528 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2477,7 +2477,7 @@ check_item_writable(svar_T *sv, int check_writable, char_u *name)
            || (check_writable == ASSIGN_FINAL
                                              && sv->sv_const == ASSIGN_CONST))
     {
-       semsg(_(e_readonlyvar), name);
+       semsg(_(e_cannot_change_readonly_variable_str), name);
        return FAIL;
     }
     return OK;

diff --git a/src/vim9script.c b/src/vim9script.c
index 85d601c7ae5d9bd35bc3b198a933430366ae160f..605d0be969047a5ab47030c4dfc9c2dab3123a5d 100644 (file)
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -962,7 +962,7 @@ check_script_var_type(
     {
        if (sv->sv_const != 0)
        {
-           semsg(_(e_readonlyvar), name);
+           semsg(_(e_cannot_change_readonly_variable_str), name);
            return FAIL;
        }
        ret = check_typval_type(sv->sv_type, value, where);