# HG changeset patch # User Christian Brabandt # Date 1694194205 -7200 # Node ID 39bc126cc890998e7bd862020af59c6d08c52a49 # Parent d84610677553e5edecfe4dcd06344339be5d9b84 patch 9.0.1884: Wrong order of arguments for error messages Commit: https://github.com/vim/vim/commit/1bd2cb11694690a77e4141bce2e34d9dfb882f1c Author: Christ van Willegen 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 Co-authored-by: Christ van Willegen diff --git a/src/errors.h b/src/errors.h --- 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 diff --git a/src/strings.c b/src/strings.c --- 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 --- 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,