To: vim_dev@googlegroups.com Subject: Patch 8.2.4291 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4291 Problem: Error number used twice. Solution: Renumber of of the errors. Files: src/errors.h *** ../vim-8.2.4290/src/errors.h 2022-01-30 18:40:40.535255817 +0000 --- src/errors.h 2022-02-03 19:52:19.809147215 +0000 *************** *** 2809,2815 **** INIT(= N_("E1090: Cannot assign to argument %s")); EXTERN char e_function_is_not_compiled_str[] INIT(= N_("E1091: Function is not compiled: %s")); ! // E1092 unused EXTERN char e_expected_nr_items_but_got_nr[] INIT(= N_("E1093: Expected %d items but got %d")); EXTERN char e_import_can_only_be_used_in_script[] --- 2809,2816 ---- INIT(= N_("E1090: Cannot assign to argument %s")); EXTERN char e_function_is_not_compiled_str[] INIT(= N_("E1091: Function is not compiled: %s")); ! EXTERN char e_cannot_nest_redir[] ! INIT(= N_("E1092: Cannot nest :redir")); EXTERN char e_expected_nr_items_but_got_nr[] INIT(= N_("E1093: Expected %d items but got %d")); EXTERN char e_import_can_only_be_used_in_script[] *************** *** 3012,3019 **** #ifdef FEAT_EVAL EXTERN char e_blob_not_set[] INIT(= N_("E1184: Blob not set")); - EXTERN char e_cannot_nest_redir[] - INIT(= N_("E1185: Cannot nest :redir")); EXTERN char e_missing_redir_end[] INIT(= N_("E1185: Missing :redir END")); EXTERN char e_expression_does_not_result_in_value_str[] --- 3013,3018 ---- *** ../vim-8.2.4290/src/version.c 2022-02-03 14:32:30.046051998 +0000 --- src/version.c 2022-02-03 19:53:53.336996602 +0000 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4291, /**/ -- I think that you'll agree that engineers are very effective in their social interactions. It's the "normal" people who are nuts. (Scott Adams - The Dilbert principle) /// 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 ///