To: vim_dev@googlegroups.com Subject: Patch 8.2.4011 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4011 Problem: Test fails because of changed error number. Solution: Restore old duplicate error message. Files: src/errors.h, src/match.c *** ../vim-8.2.4010/src/errors.h 2022-01-05 17:49:10.869225139 +0000 --- src/errors.h 2022-01-05 18:14:07.042520390 +0000 *************** *** 1861,1874 **** #endif EXTERN char e_id_is_reserved_for_match_nr[] INIT(= N_("E798: ID is reserved for \":match\": %d")); ! // E799 unused #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[] 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")); --- 1861,1875 ---- #endif EXTERN char e_id_is_reserved_for_match_nr[] INIT(= N_("E798: ID is reserved for \":match\": %d")); ! 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_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")); *** ../vim-8.2.4010/src/match.c 2022-01-05 17:49:10.877225131 +0000 --- src/match.c 2022-01-05 18:14:14.970497047 +0000 *************** *** 45,51 **** return -1; if (id < -1 || id == 0) { ! semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one), id); return -1; } if (id != -1) --- 45,51 ---- return -1; if (id < -1 || id == 0) { ! semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one_1), id); return -1; } if (id != -1) *************** *** 233,239 **** if (id < 1) { if (perr == TRUE) ! semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one), id); return -1; } while (cur != NULL && cur->id != id) --- 233,239 ---- if (id < 1) { if (perr == TRUE) ! semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one_2), id); return -1; } while (cur != NULL && cur->id != id) *** ../vim-8.2.4010/src/version.c 2022-01-05 17:49:10.885225126 +0000 --- src/version.c 2022-01-05 18:15:03.906354534 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4011, /**/ -- hundred-and-one symptoms of being an internet addict: 232. You start conversations with, "Have you gotten a fiber connection?" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///