Merge remote-tracking branch 'upstream/master' into userreg

1 files changed, 14 insertions, 14 deletions

diff --git a/test/functional/legacy/vimscript_spec.lua b/test/functional/legacy/vimscript_spec.lua
index 16a1080396..8b0a920a3e 100644
--- a/test/functional/legacy/vimscript_spec.lua
+++ b/test/functional/legacy/vimscript_spec.lua
@@ -3,16 +3,16 @@ local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local exec = helpers.exec
 local feed = helpers.feed
-local meths = helpers.meths
+local api = helpers.api
 
 before_each(clear)
 
 describe('Vim script', function()
   -- oldtest: Test_deep_nest()
-  it('Error when if/for/while/try/function is nested too deep',function()
+  it('Error when if/for/while/try/function is nested too deep', function()
     local screen = Screen.new(80, 24)
     screen:attach()
-    meths.set_option_value('laststatus', 2, {})
+    api.nvim_set_option_value('laststatus', 2, {})
     exec([[
       " Deep nesting of if ... endif
       func Test1()
@@ -59,25 +59,25 @@ describe('Vim script', function()
         let @a = ''
       endfunc
     ]])
-    screen:expect({any = '%[No Name%]'})
+    screen:expect({ any = '%[No Name%]' })
     feed(':call Test1()<CR>')
-    screen:expect({any = 'E579: '})
+    screen:expect({ any = 'E579: ' })
     feed('<C-C>')
-    screen:expect({any = '%[No Name%]'})
+    screen:expect({ any = '%[No Name%]' })
     feed(':call Test2()<CR>')
-    screen:expect({any = 'E585: '})
+    screen:expect({ any = 'E585: ' })
     feed('<C-C>')
-    screen:expect({any = '%[No Name%]'})
+    screen:expect({ any = '%[No Name%]' })
     feed(':call Test3()<CR>')
-    screen:expect({any = 'E585: '})
+    screen:expect({ any = 'E585: ' })
     feed('<C-C>')
-    screen:expect({any = '%[No Name%]'})
+    screen:expect({ any = '%[No Name%]' })
     feed(':call Test4()<CR>')
-    screen:expect({any = 'E601: '})
+    screen:expect({ any = 'E601: ' })
     feed('<C-C>')
-    screen:expect({any = '%[No Name%]'})
+    screen:expect({ any = '%[No Name%]' })
     feed(':call Test5()<CR>')
-    screen:expect({any = 'E1058: '})
+    screen:expect({ any = 'E1058: ' })
   end)
 
   -- oldtest: Test_typed_script_var()
@@ -85,6 +85,6 @@ describe('Vim script', function()
     local screen = Screen.new(80, 24)
     screen:attach()
     feed(":echo get(s:, 'foo', 'x')\n")
-    screen:expect({any = 'E116: '})
+    screen:expect({ any = 'E116: ' })
   end)
 end)