patch 9.0.1884: Wrong order of arguments for error messages

Problem:  Wrong order of arguments for error messages
Solution: Reverse order or arguments for e_aptypes_is_null_nr_str

closes: #13051

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Christ van Willegen <cvwillegen@gmail.com>

diff --git a/src/errors.h b/src/errors.h
index e719ffde1a5bacedc4dec3b890df034ab4edab86..fc40fe865fa6b98811ac118ddd0693a1c7824d79 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -3511,8 +3511,8 @@ EXTERN char e_member_str_type_mismatch_expected_str_but_got_str[]
        INIT(= N_("E1406: Member \"%s\": type mismatch, expected %s but got %s"));
 EXTERN char e_method_str_type_mismatch_expected_str_but_got_str[]
        INIT(= N_("E1407: Member \"%s\": type mismatch, expected %s but got %s"));
-EXTERN char e_aptypes_is_null_str_nr[]
-       INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %s: %d");
+EXTERN char e_aptypes_is_null_nr_str[]
+       INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %d: %s");
 EXTERN char e_interface_static_direct_access_str[]
        INIT(= N_("E1409: Cannot directly access interface \"%s\" static member \"%s\""));
 // E1371 - E1399 unused

diff --git a/src/strings.c b/src/strings.c
index 710b1d35ce59d1da211e8b48278b7ed00e239c0c..33616d609b326c70773fa39afc9d60b3c832b78c 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -2801,7 +2801,7 @@ skip_to_arg(
 
        if (ap_types == NULL || ap_types[*arg_cur] == NULL)
        {
-           siemsg(e_aptypes_is_null_str_nr, fmt, *arg_cur);
+           siemsg(e_aptypes_is_null_nr_str, *arg_cur, fmt);
            return;
        }
 

diff --git a/src/version.c b/src/version.c
index da48158d3d99badce937ca36fc7590347515d823..9797b234e72be5d9ed90b130d5405ab1019aad55 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1884,
 /**/
     1883,
 /**/