Merge remote-tracking branch 'origin/master' into lambda

2 files changed, 30 insertions, 0 deletions

diff --git a/test/functional/eval/has_spec.lua b/test/functional/eval/has_spec.lua
index 97b3b0e620..78c4e08fde 100644
--- a/test/functional/eval/has_spec.lua
+++ b/test/functional/eval/has_spec.lua
@@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local eq = helpers.eq
 local clear = helpers.clear
 local funcs = helpers.funcs
+local iswin = helpers.iswin
 
 describe('has()', function()
   before_each(clear)
@@ -49,4 +50,11 @@ describe('has()', function()
     eq(1, funcs.has("nvim-00.001.05"))
   end)
 
+  it('"unnamedplus"', function()
+    if (not iswin()) and funcs.has("clipboard") == 1 then
+      eq(1, funcs.has("unnamedplus"))
+    else
+      eq(0, funcs.has("unnamedplus"))
+    end
+  end)
 end)
diff --git a/test/functional/eval/let_spec.lua b/test/functional/eval/let_spec.lua
new file mode 100644
index 0000000000..c3ab3cc367
--- /dev/null
+++ b/test/functional/eval/let_spec.lua
@@ -0,0 +1,22 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local clear = helpers.clear
+local meths = helpers.meths
+local redir_exec = helpers.redir_exec
+
+before_each(clear)
+
+describe(':let command', function()
+  it('correctly lists variables with curly-braces', function()
+    meths.set_var('v', {0})
+    eq('\nv                     [0]', redir_exec('let {"v"}'))
+  end)
+
+  it('correctly lists variables with subscript', function()
+    meths.set_var('v', {0})
+    eq('\nv[0]                  #0', redir_exec('let v[0]'))
+    eq('\ng:["v"][0]            #0', redir_exec('let g:["v"][0]'))
+    eq('\n{"g:"}["v"][0]        #0', redir_exec('let {"g:"}["v"][0]'))
+  end)
+end)