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

4 files changed, 7 insertions, 13 deletions

diff --git a/test/functional/provider/clipboard_spec.lua b/test/functional/provider/clipboard_spec.lua
index 2c5185a974..0099183302 100644
--- a/test/functional/provider/clipboard_spec.lua
+++ b/test/functional/provider/clipboard_spec.lua
@@ -211,7 +211,7 @@ describe('clipboard', function()
     eq('', eval('provider#clipboard#Error()'))
   end)
 
-  it('g:clipboard using VimL functions', function()
+  it('g:clipboard using Vimscript functions', function()
     -- Implements a fake clipboard provider. cache_enabled is meaningless here.
     source([[let g:clipboard = {
             \  'name': 'custom',
@@ -245,7 +245,7 @@ describe('clipboard', function()
     eq({{'star', ''}, 'b'}, eval("g:dummy_clipboard_star"))
   end)
 
-  describe('g:clipboard[paste] VimL function', function()
+  describe('g:clipboard[paste] Vimscript function', function()
     it('can return empty list for empty clipboard', function()
       source([[let g:dummy_clipboard = []
               let g:clipboard = {
@@ -301,7 +301,7 @@ end)
 
 describe('clipboard (with fake clipboard.vim)', function()
   local function reset(...)
-    clear('--cmd', 'let &rtp = "test/functional/fixtures,".&rtp', ...)
+    clear('--cmd', 'set rtp^=test/functional/fixtures', ...)
   end
 
   before_each(function()
diff --git a/test/functional/provider/perl_spec.lua b/test/functional/provider/perl_spec.lua
index ce92831f4c..8049f0f3e2 100644
--- a/test/functional/provider/perl_spec.lua
+++ b/test/functional/provider/perl_spec.lua
@@ -5,12 +5,10 @@ local command = helpers.command
 local write_file = helpers.write_file
 local eval = helpers.eval
 local retry = helpers.retry
-local curbufmeths = helpers.curbufmeths
+local meths = helpers.meths
 local insert = helpers.insert
 local expect = helpers.expect
 local feed = helpers.feed
-local is_os = helpers.is_os
-local skip = helpers.skip
 
 do
   clear()
@@ -26,8 +24,6 @@ before_each(function()
 end)
 
 describe('legacy perl provider', function()
-  skip(is_os('win'))
-
   it('feature test', function()
     eq(1, eval('has("perl")'))
   end)
@@ -49,7 +45,7 @@ describe('legacy perl provider', function()
     -- :perldo 1; doesn't change $_,
     -- the buffer should not be changed
     command('normal :perldo 1;')
-    eq(false, curbufmeths.get_option('modified'))
+    eq(false, meths.get_option_value('modified', {}))
     -- insert some text
     insert('abc\ndef\nghi')
     expect([[
@@ -70,7 +66,6 @@ describe('legacy perl provider', function()
 end)
 
 describe('perl provider', function()
-  skip(is_os('win'))
   teardown(function ()
     os.remove('Xtest-perl-hello.pl')
     os.remove('Xtest-perl-hello-plugin.pl')
diff --git a/test/functional/provider/provider_spec.lua b/test/functional/provider/provider_spec.lua
index 3895b8613f..b1c326d04c 100644
--- a/test/functional/provider/provider_spec.lua
+++ b/test/functional/provider/provider_spec.lua
@@ -7,7 +7,7 @@ local pcall_err = helpers.pcall_err
 
 describe('providers', function()
   before_each(function()
-    clear('--cmd', 'let &rtp = "test/functional/fixtures,".&rtp')
+    clear('--cmd', 'set rtp^=test/functional/fixtures')
   end)
 
   it('with #Call(), missing g:loaded_xx_provider', function()
diff --git a/test/functional/provider/ruby_spec.lua b/test/functional/provider/ruby_spec.lua
index fba96100fc..d3b967dfbe 100644
--- a/test/functional/provider/ruby_spec.lua
+++ b/test/functional/provider/ruby_spec.lua
@@ -3,7 +3,6 @@ local helpers = require('test.functional.helpers')(after_each)
 local assert_alive = helpers.assert_alive
 local clear = helpers.clear
 local command = helpers.command
-local curbufmeths = helpers.curbufmeths
 local eq = helpers.eq
 local exc_exec = helpers.exc_exec
 local expect = helpers.expect
@@ -98,7 +97,7 @@ describe(':rubydo command', function()
 
   it('does not modify the buffer if no changes are made', function()
     command('normal :rubydo 42')
-    eq(false, curbufmeths.get_option('modified'))
+    eq(false, meths.get_option_value('modified', {}))
   end)
 end)