vim-patch:7.4.1168 (#19645)

Problem:    This doesn't give the right result: eval(string(v:true)). (Nikolay
            Pavlov)
Solution:   Make the string "v:true" instead of "true".
https://github.com/vim/vim/commit/f48aa160fdd7b8caa7678e1a2139244dd2bdc547

3 files changed, 17 insertions, 17 deletions

diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua
index 04fbb807be..8abfa465ab 100644
--- a/test/functional/core/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -690,8 +690,8 @@ describe('jobs', function()
     -- jobstart() shares its v:servername with the child via $NVIM.
     eq('NVIM='..addr, get_env_in_child_job('NVIM'))
     -- $NVIM_LISTEN_ADDRESS is unset by server_init in the child.
-    eq('NVIM_LISTEN_ADDRESS=null', get_env_in_child_job('NVIM_LISTEN_ADDRESS'))
-    eq('NVIM_LISTEN_ADDRESS=null', get_env_in_child_job('NVIM_LISTEN_ADDRESS',
+    eq('NVIM_LISTEN_ADDRESS=v:null', get_env_in_child_job('NVIM_LISTEN_ADDRESS'))
+    eq('NVIM_LISTEN_ADDRESS=v:null', get_env_in_child_job('NVIM_LISTEN_ADDRESS',
       { NVIM_LISTEN_ADDRESS='Xtest_jobstart_env' }))
     -- User can explicitly set $NVIM_LOG_FILE, $VIM, $VIMRUNTIME.
     eq('NVIM_LOG_FILE=Xtest_jobstart_env',
diff --git a/test/functional/vimscript/special_vars_spec.lua b/test/functional/vimscript/special_vars_spec.lua
index 97a12d490d..14ccbc3827 100644
--- a/test/functional/vimscript/special_vars_spec.lua
+++ b/test/functional/vimscript/special_vars_spec.lua
@@ -125,9 +125,9 @@ describe('Special values', function()
   end)
 
   it('work with . (concat) properly', function()
-    eq("true", eval('"" . v:true'))
-    eq("null", eval('"" . v:null'))
-    eq("false", eval('"" . v:false'))
+    eq("v:true", eval('"" . v:true'))
+    eq("v:null", eval('"" . v:null'))
+    eq("v:false", eval('"" . v:false'))
   end)
 
   it('work with type()', function()
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index e61b568f3a..6387f89fe4 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -2992,9 +2992,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', ''},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', ''},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', ''},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', ''},
           }) do
             -- Using to_cstr in place of Neovim allocated string, cannot
@@ -3036,9 +3036,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', nil},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', nil},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', nil},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', nil},
           }) do
             -- Using to_cstr, cannot free with tv_clear
@@ -3078,9 +3078,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', ''},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', ''},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', ''},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', ''},
           }) do
             -- Using to_cstr, cannot free with tv_clear
@@ -3121,9 +3121,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', nil},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', nil},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', nil},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', nil},
           }) do
             -- Using to_cstr, cannot free with tv_clear