commit e83cca291112ea66f49079975e102ee36a47a24e
author Bram Moolenaar <Bram@vim.org> Mon Sep 07 18:53:21 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Sep 07 18:53:21 2020 +0200
tree 313fb36ab531a6f2b5c981f920c09aa31212165c
parent 44d6652d561d628d12e3ff7f6636ea7d1f805ced

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)

src/regexp.c

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

src/regexp_bt.c

diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index d19515a..03b07a1 100644
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -2293,7 +2293,7 @@
     int		flags;
 
     if (expr == NULL)
-	EMSG_RET_NULL(_(e_null));
+	IEMSG_RET_NULL(_(e_null));
 
     init_class_tab();
 
@@ -2917,7 +2917,7 @@
 	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 @@
 	    break;
 
 	  default:
-	    emsg(_(e_re_corr));
+	    iemsg(_(e_re_corr));
 #ifdef DEBUG
 	    printf("Illegal op code %d\n", op);
 #endif
@@ -4499,7 +4499,7 @@
 	{
 	    // 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 @@
     // Be paranoid...
     if (prog == NULL || line == NULL)
     {
-	emsg(_(e_null));
+	iemsg(_(e_null));
 	goto theend;
     }
 

src/regexp_nfa.c

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

src/version.c

diff --git a/src/version.c b/src/version.c
index 2a13bf3..1b91560 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1633,
+/**/
     1632,
 /**/
     1631,