# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1597786204 -7200
# Node ID 25ef87c958801e0cdf2c72ef13a67dc6e647ed25
# Parent  ca21a4cb50818b3bc588efc09c5607c234d65726
patch 8.2.1484: flaky failure in assert_fails()

Commit: https://github.com/vim/vim/commit/9b02d64cff7664b9643205d6e23b08da688fe87a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Aug 18 23:24:13 2020 +0200

    patch 8.2.1484: flaky failure in assert_fails()

    Problem:    Flaky failure in assert_fails().
    Solution:   Only used fourth argument if there is a third argument.

diff --git a/src/testing.c b/src/testing.c
--- a/src/testing.c
+++ b/src/testing.c
@@ -615,7 +615,8 @@ f_assert_fails(typval_T *argvars, typval
 	    goto theend;
 	}
 
-	if (!error_found && argvars[3].v_type == VAR_NUMBER
+	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)
 	{
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1484,
+/**/
     1483,
 /**/
     1482,