patch 8.2.1633: some error messages are internal but do not use iemsg()

Problem:    Some error messages are internal but do not use iemsg().
Solution:   Use iemsg(). (Dominique Pellé, closes #6894)

diff --git a/src/regexp.c b/src/regexp.c
index 22b2d17a33c39e1c0c2ccf059ac325bcc088af1e..f7f04ea876b13f6e2a445ed9316733154959a7b7 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2279,7 +2279,7 @@ vim_regsub_both(
                    else if (*s == NUL) // we hit NUL.
                    {
                        if (copy)
-                           emsg(_(e_re_damg));
+                           iemsg(_(e_re_damg));
                        goto exit;
                    }
                    else

diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index d19515addeba7e98311a137f05ab1789c2fd943a..03b07a167953538dcdae10bd1fee829c010ca78c 100644 (file)
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -2293,7 +2293,7 @@ bt_regcomp(char_u *expr, int re_flags)
     int                flags;
 
     if (expr == NULL)
-       EMSG_RET_NULL(_(e_null));
+       IEMSG_RET_NULL(_(e_null));
 
     init_class_tab();
 
@@ -2917,7 +2917,7 @@ do_class:
        break;
 
       default:                 // Oh dear.  Called inappropriately.
-       emsg(_(e_re_corr));
+       iemsg(_(e_re_corr));
 #ifdef DEBUG
        printf("Called regrepeat with op code %d\n", OP(p));
 #endif
@@ -4099,7 +4099,7 @@ regmatch(
            break;
 
          default:
-           emsg(_(e_re_corr));
+           iemsg(_(e_re_corr));
 #ifdef DEBUG
            printf("Illegal op code %d\n", op);
 #endif
@@ -4499,7 +4499,7 @@ regmatch(
        {
            // We get here only if there's trouble -- normally "case END" is
            // the terminating point.
-           emsg(_(e_re_corr));
+           iemsg(_(e_re_corr));
 #ifdef DEBUG
            printf("Premature EOL\n");
 #endif
@@ -4649,7 +4649,7 @@ bt_regexec_both(
     // Be paranoid...
     if (prog == NULL || line == NULL)
     {
-       emsg(_(e_null));
+       iemsg(_(e_null));
        goto theend;
     }
 

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 444b446ca6f602af6d6c06e04f64751599decb60..c75c575fd4d4f22c4dc12cf2d0b18cea57960d3c 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7147,7 +7147,7 @@ nfa_regexec_both(
     // Be paranoid...
     if (prog == NULL || line == NULL)
     {
-       emsg(_(e_null));
+       iemsg(_(e_null));
        goto theend;
     }
 

diff --git a/src/version.c b/src/version.c
index 2a13bf3dd8639d9112dba771a00c0031d286588a..1b91560bba117d60f627190677d66ff6efd00be1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1633,
 /**/
     1632,
 /**/