thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.4011: test fails because of changed error number

Browse Source 
Problem:    Test fails because of changed error number.
Solution:   Restore old duplicate error message.
This commit is contained in:
Bram Moolenaar
2022-01-05 18:16:53 +00:00
parent 9d00e4a814
commit bb8cac56d9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/errors.h
View File

@@ -1861,14 +1861,15 @@ EXTERN char e_spellfilemising_autocommand_deleted_buffer[]
#endif #endif
EXTERN char e_id_is_reserved_for_match_nr[] EXTERN char e_id_is_reserved_for_match_nr[]
INIT(= N_("E798: ID is reserved for \":match\": %d")); 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 #ifndef FEAT_ARABIC
EXTERN char e_arabic_cannot_be_used_not_enabled_at_compile_time[] 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")); INIT(= N_("E800: Arabic cannot be used: Not enabled at compile time\n"));
#endif #endif
EXTERN char e_id_already_taken_nr[] EXTERN char e_id_already_taken_nr[]
INIT(= N_("E801: ID already taken: %d")); 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)")); INIT(= N_("E802: Invalid ID: %d (must be greater than or equal to 1)"));
EXTERN char e_id_not_found_nr[] EXTERN char e_id_not_found_nr[]
INIT(= N_("E803: ID not found: %d")); INIT(= N_("E803: ID not found: %d"));

4
src/match.c
View File

@@ -45,7 +45,7 @@ match_add(
return -1; return -1;
if (id < -1 || id == 0) 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; return -1;
} }
if (id != -1) if (id != -1)
@@ -233,7 +233,7 @@ match_delete(win_T *wp, int id, int perr)
if (id < 1) if (id < 1)
{ {
if (perr == TRUE) 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; return -1;
} }
while (cur != NULL && cur->id != id) while (cur != NULL && cur->id != id)

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4011,
/**/ /**/
4010, 4010,
/**/ /**/