Skip to content

Commit

Permalink
patch 8.2.4011: test fails because of changed error number
Browse files Browse the repository at this point in the history
Problem:    Test fails because of changed error number.
Solution:   Restore old duplicate error message.
  • Loading branch information
brammool committed Jan 5, 2022
1 parent 9d00e4a commit bb8cac5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions src/errors.h
Expand Up @@ -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"));
Expand Down
4 changes: 2 additions & 2 deletions src/match.c
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4011,
/**/
4010,
/**/
Expand Down

0 comments on commit bb8cac5

Please sign in to comment.