To: vim_dev@googlegroups.com Subject: Patch 8.2.1484 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1484 Problem: Flaky failure in assert_fails(). Solution: Only used fourth argument if there is a third argument. Files: src/testing.c *** ../vim-8.2.1483/src/testing.c 2020-08-18 13:41:47.215350419 +0200 --- src/testing.c 2020-08-18 23:21:24.549159733 +0200 *************** *** 615,621 **** goto theend; } ! if (!error_found && argvars[3].v_type == VAR_NUMBER && argvars[3].vval.v_number >= 0 && argvars[3].vval.v_number != emsg_assert_fails_lnum) { --- 615,622 ---- goto theend; } ! if (!error_found && argvars[2].v_type != VAR_UNKNOWN ! && argvars[3].v_type == VAR_NUMBER && argvars[3].vval.v_number >= 0 && argvars[3].vval.v_number != emsg_assert_fails_lnum) { *** ../vim-8.2.1483/src/version.c 2020-08-18 22:50:34.769829447 +0200 --- src/version.c 2020-08-18 23:23:47.592197681 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1484, /**/ -- "The amigos also appear to be guilty of not citing the work of others who had gone before them. Even worse, they have a chapter about modeling time and space without making a single reference to Star Trek!" (Scott Ambler, reviewing the UML User Guide) /// 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 ///