]> granicus.if.org Git - vim/commitdiff
patch 8.2.4011: test fails because of changed error number v8.2.4011
authorBram Moolenaar <Bram@vim.org>
Wed, 5 Jan 2022 18:16:53 +0000 (18:16 +0000)
committerBram Moolenaar <Bram@vim.org>
Wed, 5 Jan 2022 18:16:53 +0000 (18:16 +0000)
Problem:    Test fails because of changed error number.
Solution:   Restore old duplicate error message.

src/errors.h
src/match.c
src/version.c

index 41ce5c10cd993d7ed1f5002e7b5b98f29dfabc04..7f2d8c7f3d4ebf00bd7f8dd4428b161e31fc874f 100644 (file)
@@ -1861,14 +1861,15 @@ EXTERN char e_spellfilemising_autocommand_deleted_buffer[]
 #endif
 EXTERN char e_id_is_reserved_for_match_nr[]
        INIT(= N_("E798: ID is reserved for \":match\": %d"));
-// E799 unused
+EXTERN char e_invalid_id_nr_must_be_greater_than_or_equal_to_one_1[]
+       INIT(= N_("E799: Invalid ID: %d (must be greater than or equal to 1)"));
 #ifndef FEAT_ARABIC
 EXTERN char e_arabic_cannot_be_used_not_enabled_at_compile_time[]
        INIT(= N_("E800: Arabic cannot be used: Not enabled at compile time\n"));
 #endif
 EXTERN char e_id_already_taken_nr[]
        INIT(= N_("E801: ID already taken: %d"));
-EXTERN char e_invalid_id_nr_must_be_greater_than_or_equal_to_one[]
+EXTERN char e_invalid_id_nr_must_be_greater_than_or_equal_to_one_2[]
        INIT(= N_("E802: Invalid ID: %d (must be greater than or equal to 1)"));
 EXTERN char e_id_not_found_nr[]
        INIT(= N_("E803: ID not found: %d"));
index 491f8c03a0c10050c30d61a2e669796ffed931ea..3d7010e774ccbacd4934c6d6c7af09b4b5ec2f28 100644 (file)
@@ -45,7 +45,7 @@ match_add(
        return -1;
     if (id < -1 || id == 0)
     {
-       semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one), id);
+       semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one_1), id);
        return -1;
     }
     if (id != -1)
@@ -233,7 +233,7 @@ match_delete(win_T *wp, int id, int perr)
     if (id < 1)
     {
        if (perr == TRUE)
-           semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one), id);
+           semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one_2), id);
        return -1;
     }
     while (cur != NULL && cur->id != id)
index 8a508d35adf1c91459deb0acebc3ebb49c769eb5..4e00f7bf5ca77c858aef2f3b9b4817b364c4a537 100644 (file)
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4011,
 /**/
     4010,
 /**/