patch 7.4.1271

Problem:    assert_false(v:false) reports an error. (Nikolai Pavlov)
Solution:   Recognize v:true and v:false. (Closes #625)

diff --git a/src/eval.c b/src/eval.c
index 7ce739ce785c43fa0b31d2cca4182bed379b8ee6..1c2bd61aa0baa3207f0429c44a53ebe8bb55d5c4 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -9216,6 +9216,9 @@ assert_bool(typval_T *argvars, int isTrue)
     int                error = FALSE;
     garray_T   ga;
 
+    if (argvars[0].v_type == VAR_SPECIAL
+           && argvars[0].vval.v_number == (isTrue ? VVAL_TRUE : VV_FALSE))
+       return;
     if (argvars[0].v_type != VAR_NUMBER
            || (get_tv_number_chk(&argvars[0], &error) == 0) == isTrue
            || error)

diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim
index 22046e2b8d5847e99f13ce36a5a666b671567b28..6d2f80094aab3ad1e22ed44d81aa643c169db843 100644 (file)
--- a/src/testdir/test_assert.vim
+++ b/src/testdir/test_assert.vim
@@ -2,11 +2,13 @@
 
 func Test_assert_false()
   call assert_false(0)
+  call assert_false(v:false)
 endfunc
 
 func Test_assert_true()
   call assert_true(1)
   call assert_true(123)
+  call assert_true(v:true)
 endfunc
 
 func Test_assert_equal()

diff --git a/src/version.c b/src/version.c
index 74518d936a9d959e046934bf702e94ce43f52092..471bd343cd14972d27a1c41e2ddf3d5fdd1e12d9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1271,
 /**/
     1270,
 /**/