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

1 files changed, 19 insertions, 15 deletions

diff --git a/test/functional/plugin/shada_spec.lua b/test/functional/plugin/shada_spec.lua
index 93cf6d2b77..8d37100607 100644
--- a/test/functional/plugin/shada_spec.lua
+++ b/test/functional/plugin/shada_spec.lua
@@ -2150,6 +2150,7 @@ describe('plugin/shada.vim', function()
 
   teardown(function()
     os.remove(fname)
+    os.remove(fname .. '.tst')
     os.remove(fname_tmp)
   end)
 
@@ -2180,8 +2181,8 @@ describe('plugin/shada.vim', function()
       '  - contents      "ab"',
       '  -               "a"',
     }, nvim_eval('getline(1, "$")'))
-    eq(false, curbuf('get_option', 'modified'))
-    eq('shada', curbuf('get_option', 'filetype'))
+    eq(false, nvim('get_option_value', 'modified', {}))
+    eq('shada', nvim('get_option_value', 'filetype', {}))
     nvim_command('edit ' .. fname_tmp)
     eq({
       'History entry with timestamp ' .. epoch .. ':',
@@ -2190,8 +2191,8 @@ describe('plugin/shada.vim', function()
       '  - contents      "ab"',
       '  -               "b"',
     }, nvim_eval('getline(1, "$")'))
-    eq(false, curbuf('get_option', 'modified'))
-    eq('shada', curbuf('get_option', 'filetype'))
+    eq(false, nvim('get_option_value', 'modified', {}))
+    eq('shada', nvim('get_option_value', 'filetype', {}))
     eq('++opt not supported', exc_exec('edit ++enc=latin1 ' .. fname))
     neq({
       'History entry with timestamp ' .. epoch .. ':',
@@ -2200,7 +2201,7 @@ describe('plugin/shada.vim', function()
       '  - contents      "ab"',
       '  -               "a"',
     }, nvim_eval('getline(1, "$")'))
-    neq(true, curbuf('get_option', 'modified'))
+    neq(true, nvim('get_option_value', 'modified', {}))
   end)
 
   it('event FileReadCmd', function()
@@ -2216,8 +2217,8 @@ describe('plugin/shada.vim', function()
       '  - contents      "ab"',
       '  -               "a"',
     }, nvim_eval('getline(1, "$")'))
-    eq(true, curbuf('get_option', 'modified'))
-    neq('shada', curbuf('get_option', 'filetype'))
+    eq(true, nvim('get_option_value', 'modified', {}))
+    neq('shada', nvim('get_option_value', 'filetype', {}))
     nvim_command('1,$read ' .. fname_tmp)
     eq({
       '',
@@ -2232,9 +2233,9 @@ describe('plugin/shada.vim', function()
       '  - contents      "ab"',
       '  -               "b"',
     }, nvim_eval('getline(1, "$")'))
-    eq(true, curbuf('get_option', 'modified'))
-    neq('shada', curbuf('get_option', 'filetype'))
-    curbuf('set_option', 'modified', false)
+    eq(true, nvim('get_option_value', 'modified', {}))
+    neq('shada', nvim('get_option_value', 'filetype', {}))
+    nvim('set_option_value', 'modified', false, {})
     eq('++opt not supported', exc_exec('$read ++enc=latin1 ' .. fname))
     eq({
       '',
@@ -2249,7 +2250,7 @@ describe('plugin/shada.vim', function()
       '  - contents      "ab"',
       '  -               "b"',
     }, nvim_eval('getline(1, "$")'))
-    neq(true, curbuf('get_option', 'modified'))
+    neq(true, nvim('get_option_value', 'modified', {}))
   end)
 
   it('event BufWriteCmd', function()
@@ -2419,6 +2420,9 @@ describe('plugin/shada.vim', function()
 
   it('event SourceCmd', function()
     reset(fname)
+    finally(function()
+      nvim_command('set shadafile=NONE')  -- Avoid writing shada file on exit
+    end)
     wshada('\004\000\006\146\000\196\002ab')
     wshada_tmp('\004\001\006\146\000\196\002bc')
     eq(0, exc_exec('source ' .. fname))
@@ -2513,10 +2517,10 @@ describe('ftplugin/shada.vim', function()
   it('sets options correctly', function()
     nvim_command('filetype plugin indent on')
     nvim_command('setlocal filetype=shada')
-    eq(true, curbuf('get_option', 'expandtab'))
-    eq(2, curbuf('get_option', 'tabstop'))
-    eq(2, curbuf('get_option', 'softtabstop'))
-    eq(2, curbuf('get_option', 'shiftwidth'))
+    eq(true, nvim('get_option_value', 'expandtab', {}))
+    eq(2, nvim('get_option_value', 'tabstop', {}))
+    eq(2, nvim('get_option_value', 'softtabstop', {}))
+    eq(2, nvim('get_option_value', 'shiftwidth', {}))
   end)
 
   it('sets indentkeys correctly', function()