Deprecate &viminfo and :[rw]v, add &shada and :[rw]sh

1 files changed, 8 insertions, 8 deletions

diff --git a/test/functional/shada/registers_spec.lua b/test/functional/shada/registers_spec.lua
index 7efb100cd6..67b0661151 100644
--- a/test/functional/shada/registers_spec.lua
+++ b/test/functional/shada/registers_spec.lua
@@ -48,7 +48,7 @@ describe('ShaDa support code', function()
   end)
 
   it('does not dump registers with zero <', function()
-    nvim_command('set viminfo=\'0,<0')
+    nvim_command('set shada=\'0,<0')
     setreg('c', {'d', 'e', ''}, 'c')
     setreg('l', {'a', 'b', 'cde'}, 'l')
     setreg('b', {'bca', 'abc', 'cba'}, 'b3')
@@ -63,7 +63,7 @@ describe('ShaDa support code', function()
     setreg('c', {'d', 'e', ''}, 'c')
     setreg('l', {'a', 'b', 'cde'}, 'l')
     setreg('b', {'bca', 'abc', 'cba'}, 'b3')
-    set_additional_cmd('set viminfo=\'0,<0')
+    set_additional_cmd('set shada=\'0,<0')
     nvim_command('qa')
     reset()
     eq({{'d', 'e', ''}, 'v'}, getreg('c'))
@@ -72,7 +72,7 @@ describe('ShaDa support code', function()
   end)
 
   it('does not dump registers with zero "', function()
-    nvim_command('set viminfo=\'0,\\"0')
+    nvim_command('set shada=\'0,\\"0')
     setreg('c', {'d', 'e', ''}, 'c')
     setreg('l', {'a', 'b', 'cde'}, 'l')
     setreg('b', {'bca', 'abc', 'cba'}, 'b3')
@@ -87,7 +87,7 @@ describe('ShaDa support code', function()
     setreg('c', {'d', 'e', ''}, 'c')
     setreg('l', {'a', 'b', 'cde'}, 'l')
     setreg('b', {'bca', 'abc', 'cba'}, 'b3')
-    set_additional_cmd('set viminfo=\'0,\\"0')
+    set_additional_cmd('set shada=\'0,\\"0')
     nvim_command('qa')
     reset()
     eq({{'d', 'e', ''}, 'v'}, getreg('c'))
@@ -96,7 +96,7 @@ describe('ShaDa support code', function()
   end)
 
   it('does dump registers with zero ", but non-zero <', function()
-    nvim_command('set viminfo=\'0,\\"0,<50')
+    nvim_command('set shada=\'0,\\"0,<50')
     setreg('c', {'d', 'e', ''}, 'c')
     setreg('l', {'a', 'b', 'cde'}, 'l')
     setreg('b', {'bca', 'abc', 'cba'}, 'b3')
@@ -108,7 +108,7 @@ describe('ShaDa support code', function()
   end)
 
   it('does limit number of lines according to <', function()
-    nvim_command('set viminfo=\'0,<2')
+    nvim_command('set shada=\'0,<2')
     setreg('o', {'d'}, 'c')
     setreg('t', {'a', 'b', 'cde'}, 'l')
     nvim_command('qa')
@@ -118,7 +118,7 @@ describe('ShaDa support code', function()
   end)
 
   it('does limit number of lines according to "', function()
-    nvim_command('set viminfo=\'0,\\"2')
+    nvim_command('set shada=\'0,\\"2')
     setreg('o', {'d'}, 'c')
     setreg('t', {'a', 'b', 'cde'}, 'l')
     nvim_command('qa')
@@ -128,7 +128,7 @@ describe('ShaDa support code', function()
   end)
 
   it('does limit number of lines according to < rather then "', function()
-    nvim_command('set viminfo=\'0,\\"2,<3')
+    nvim_command('set shada=\'0,\\"2,<3')
     setreg('o', {'d'}, 'c')
     setreg('t', {'a', 'b', 'cde'}, 'l')
     setreg('h', {'abc', 'acb', 'bac', 'bca', 'cab', 'cba'}, 'b3')