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

1 files changed, 26 insertions, 26 deletions

diff --git a/test/functional/options/num_options_spec.lua b/test/functional/options/num_options_spec.lua
index 16a53c75e6..0614bcf814 100644
--- a/test/functional/options/num_options_spec.lua
+++ b/test/functional/options/num_options_spec.lua
@@ -1,40 +1,40 @@
 -- Tests for :setlocal and :setglobal
 
 local helpers = require('test.functional.helpers')(after_each)
-local clear, feed_command, eval, eq, meths =
-  helpers.clear, helpers.feed_command, helpers.eval, helpers.eq, helpers.meths
+local clear, feed_command, eval, eq, api =
+  helpers.clear, helpers.feed_command, helpers.eval, helpers.eq, helpers.api
 
 local function should_fail(opt, value, errmsg)
   feed_command('setglobal ' .. opt .. '=' .. value)
-  eq(errmsg, eval("v:errmsg"):match("E%d*"))
+  eq(errmsg, eval('v:errmsg'):match('E%d*'))
   feed_command('let v:errmsg = ""')
   feed_command('setlocal ' .. opt .. '=' .. value)
-  eq(errmsg, eval("v:errmsg"):match("E%d*"))
+  eq(errmsg, eval('v:errmsg'):match('E%d*'))
   feed_command('let v:errmsg = ""')
-  local status, err = pcall(meths.set_option_value, opt, value, {})
+  local status, err = pcall(api.nvim_set_option_value, opt, value, {})
   eq(status, false)
-  eq(errmsg, err:match("E%d*"))
-  eq('', eval("v:errmsg"))
+  eq(errmsg, err:match('E%d*'))
+  eq('', eval('v:errmsg'))
 end
 
 local function should_succeed(opt, value)
   feed_command('setglobal ' .. opt .. '=' .. value)
   feed_command('setlocal ' .. opt .. '=' .. value)
-  meths.set_option_value(opt, value, {})
-  eq(value, meths.get_option_value(opt, {}))
-  eq('', eval("v:errmsg"))
+  api.nvim_set_option_value(opt, value, {})
+  eq(value, api.nvim_get_option_value(opt, {}))
+  eq('', eval('v:errmsg'))
 end
 
 describe(':setlocal', function()
   before_each(clear)
 
   it('setlocal sets only local value', function()
-    eq(0, meths.get_option_value('iminsert', {scope='global'}))
+    eq(0, api.nvim_get_option_value('iminsert', { scope = 'global' }))
     feed_command('setlocal iminsert=1')
-    eq(0, meths.get_option_value('iminsert', {scope='global'}))
-    eq(-1, meths.get_option_value('imsearch', {scope='global'}))
+    eq(0, api.nvim_get_option_value('iminsert', { scope = 'global' }))
+    eq(-1, api.nvim_get_option_value('imsearch', { scope = 'global' }))
     feed_command('setlocal imsearch=1')
-    eq(-1, meths.get_option_value('imsearch', {scope='global'}))
+    eq(-1, api.nvim_get_option_value('imsearch', { scope = 'global' }))
   end)
 end)
 
@@ -77,44 +77,44 @@ describe(':set validation', function()
 
     -- If smaller than 1 this one is set to 'lines'-1
     feed_command('setglobal window=-10')
-    meths.set_option_value('window', -10, {})
-    eq(23, meths.get_option_value('window', {}))
-    eq('', eval("v:errmsg"))
+    api.nvim_set_option_value('window', -10, {})
+    eq(23, api.nvim_get_option_value('window', {}))
+    eq('', eval('v:errmsg'))
 
     -- 'scrolloff' and 'sidescrolloff' can have a -1 value when
     -- set for the current window, but not globally
     feed_command('setglobal scrolloff=-1')
-    eq('E487', eval("v:errmsg"):match("E%d*"))
+    eq('E487', eval('v:errmsg'):match('E%d*'))
 
     feed_command('setglobal sidescrolloff=-1')
-    eq('E487', eval("v:errmsg"):match("E%d*"))
+    eq('E487', eval('v:errmsg'):match('E%d*'))
 
     feed_command('let v:errmsg=""')
 
     feed_command('setlocal scrolloff=-1')
-    eq('', eval("v:errmsg"))
+    eq('', eval('v:errmsg'))
 
     feed_command('setlocal sidescrolloff=-1')
-    eq('', eval("v:errmsg"))
+    eq('', eval('v:errmsg'))
   end)
 
   it('set wmh/wh wmw/wiw checks', function()
     feed_command('set winheight=2')
     feed_command('set winminheight=3')
-    eq('E591', eval("v:errmsg"):match("E%d*"))
+    eq('E591', eval('v:errmsg'):match('E%d*'))
 
     feed_command('set winwidth=2')
     feed_command('set winminwidth=3')
-    eq('E592', eval("v:errmsg"):match("E%d*"))
+    eq('E592', eval('v:errmsg'):match('E%d*'))
   end)
 
   it('set maxcombine resets to 6', function()
     local function setto(value)
       feed_command('setglobal maxcombine=' .. value)
       feed_command('setlocal maxcombine=' .. value)
-      meths.set_option_value('maxcombine', value, {})
-      eq(6, meths.get_option_value('maxcombine', {}))
-      eq('', eval("v:errmsg"))
+      api.nvim_set_option_value('maxcombine', value, {})
+      eq(6, api.nvim_get_option_value('maxcombine', {}))
+      eq('', eval('v:errmsg'))
     end
     setto(0)
     setto(1)