Mercurial > vim

changeset 33214:39bc126cc890 v9.0.1884

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1884: Wrong order of arguments for error messages Commit: https://github.com/vim/vim/commit/1bd2cb11694690a77e4141bce2e34d9dfb882f1c Author: Christ van Willegen <cvwillegen@gmail.com> Date: Fri Sep 8 19:17:09 2023 +0200 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>
author Christian Brabandt <cb@256bit.org>
date Fri, 08 Sep 2023 19:30:05 +0200
parents d84610677553
children b6841db859f6
files src/errors.h src/strings.c src/version.c
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/errors.h
+++ b/src/errors.h
@@ -3511,8 +3511,8 @@ EXTERN char e_member_str_type_mismatch_e
 	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
--- 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;
 	}
 
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1884,
+/**/
     1883,
 /**/
     1882,