From f48aa160fdd7b8caa7678e1a2139244dd2bdc547 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 24 Jan 2016 17:54:24 +0100 Subject: patch 7.4.1168 Problem: This doesn't give the right result: eval(string(v:true)). (Nikolay Pavlov) Solution: Make the string "v:true" instead of "true". --- src/eval.c | 8 ++++---- src/testdir/test_viml.vim | 8 ++++---- src/version.c | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/eval.c b/src/eval.c index b4cb3852ab..860bc358e7 100644 --- a/src/eval.c +++ b/src/eval.c @@ -7825,10 +7825,10 @@ get_var_special_name(int nr) { switch (nr) { - case VVAL_FALSE: return "false"; - case VVAL_TRUE: return "true"; - case VVAL_NONE: return "none"; - case VVAL_NULL: return "null"; + case VVAL_FALSE: return "v:false"; + case VVAL_TRUE: return "v:true"; + case VVAL_NONE: return "v:none"; + case VVAL_NULL: return "v:null"; } EMSG2(_(e_intern2), "get_var_special_name()"); return "42"; diff --git a/src/testdir/test_viml.vim b/src/testdir/test_viml.vim index 502cd73c42..522515c989 100644 --- a/src/testdir/test_viml.vim +++ b/src/testdir/test_viml.vim @@ -942,10 +942,10 @@ func Test_type() call assert_equal(0, 0 + v:none) call assert_equal(0, 0 + v:null) - call assert_equal('false', '' . v:false) - call assert_equal('true', '' . v:true) - call assert_equal('none', '' . v:none) - call assert_equal('null', '' . v:null) + call assert_equal('v:false', '' . v:false) + call assert_equal('v:true', '' . v:true) + call assert_equal('v:none', '' . v:none) + call assert_equal('v:null', '' . v:null) call assert_true(v:false == 0) call assert_false(v:false != 0) diff --git a/src/version.c b/src/version.c index 5cca6e6a1e..1ea136d0b4 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1168, /**/ 1167, /**/ -- cgit v1.2.3