To: vim_dev@googlegroups.com Subject: Patch 8.2.0990 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0990 (after 8.2.0988) Problem: Using duplicate error number. Solution: Use an unused error number. Add a test for it. Files: src/globals.h, src/testdir/test_functions.vim *** ../vim-8.2.0989/src/globals.h 2020-06-16 20:03:38.747351038 +0200 --- src/globals.h 2020-06-16 22:17:36.334717163 +0200 *************** *** 1699,1706 **** EXTERN char e_unknown_option[] INIT(= N_("E113: Unknown option: %s")); EXTERN char e_letunexp[] INIT(= N_("E18: Unexpected characters in :let")); EXTERN char e_reduceempty[] INIT(= N_("E998: Reduce of an empty %s with no initial value")); ! // TODO: Change Error Number ! EXTERN char e_no_dict_key[] INIT(= N_("E999: Dictionary with key \"%s\" required")); #endif #ifdef FEAT_QUICKFIX EXTERN char e_readerrf[] INIT(= N_("E47: Error while reading errorfile")); --- 1699,1705 ---- EXTERN char e_unknown_option[] INIT(= N_("E113: Unknown option: %s")); EXTERN char e_letunexp[] INIT(= N_("E18: Unexpected characters in :let")); EXTERN char e_reduceempty[] INIT(= N_("E998: Reduce of an empty %s with no initial value")); ! EXTERN char e_no_dict_key[] INIT(= N_("E857: Dictionary key \"%s\" required")); #endif #ifdef FEAT_QUICKFIX EXTERN char e_readerrf[] INIT(= N_("E47: Error while reading errorfile")); *** ../vim-8.2.0989/src/testdir/test_functions.vim 2020-06-16 20:03:38.747351038 +0200 --- src/testdir/test_functions.vim 2020-06-16 22:22:06.761484506 +0200 *************** *** 1958,1963 **** --- 1958,1964 ---- let files = readdirex('Xdir2', 1, #{sort: 'none'})->map({-> v:val.name}) let unsorted = copy(files) call assert_equal(['README.txt', 'Readme.txt', 'readme.txt'], sort(files), 'unsorted') + call assert_fails("call readdirex('Xdir2', 1, #{slort: 'none'})", 'E857: Dictionary key "sort" required') " 3) sort by case (same as default) let files = readdirex('Xdir2', 1, #{sort: 'case'})->map({-> v:val.name}) *** ../vim-8.2.0989/src/version.c 2020-06-16 20:58:03.441240175 +0200 --- src/version.c 2020-06-16 22:23:09.025201055 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 990, /**/ -- "It's so simple to be wise. Just think of something stupid to say and then don't say it." -- Sam Levenson /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///