summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-05 18:16:53 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-05 18:16:53 +0000
commitbb8cac56d9c398a2b546d9c81c15e8c3d8fd811e (patch)
tree34ba9bbde3c7dacc97dedef06543356406239154
parent9d00e4a8146862c17ed429dc6b1b43349acb2b5f (diff)
patch 8.2.4011: test fails because of changed error numberv8.2.4011
Problem: Test fails because of changed error number. Solution: Restore old duplicate error message.
-rw-r--r--src/errors.h5
-rw-r--r--src/match.c4
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 4 deletions
diff --git a/src/errors.h b/src/errors.h
index 41ce5c10cd..7f2d8c7f3d 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -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"));
diff --git a/src/match.c b/src/match.c
index 491f8c03a0..3d7010e774 100644
--- a/src/match.c
+++ b/src/match.c
@@ -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)
diff --git a/src/version.c b/src/version.c
index 8a508d35ad..4e00f7bf5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4011,
+/**/
4010,
/**/
4009,