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

39 files changed, 1959 insertions, 1003 deletions

diff --git a/test/functional/legacy/006_argument_list_spec.lua b/test/functional/legacy/006_argument_list_spec.lua
deleted file mode 100644
index d269bf8ec9..0000000000
--- a/test/functional/legacy/006_argument_list_spec.lua
+++ /dev/null
@@ -1,85 +0,0 @@
--- Test for autocommand that redefines the argument list, when doing ":all".
-
-local helpers = require('test.functional.helpers')(after_each)
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
-local command, dedent, eq = helpers.command, helpers.dedent, helpers.eq
-local curbuf_contents = helpers.curbuf_contents
-local poke_eventloop = helpers.poke_eventloop
-
-describe('argument list', function()
-  setup(clear)
-
-  it('is working', function()
-    insert([[
-      start of test file Xxx
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx]])
-    poke_eventloop()
-
-    command('au BufReadPost Xxx2 next Xxx2 Xxx1')
-    command('/^start of')
-
-    -- Write test file Xxx1
-    feed('A1<Esc>:.,/end of/w! Xxx1<cr>')
-
-    -- Write test file Xxx2
-    feed('$r2:.,/end of/w! Xxx2<cr>')
-
-    -- Write test file Xxx3
-    feed('$r3:.,/end of/w! Xxx3<cr>')
-    poke_eventloop()
-
-    -- Redefine arglist; go to Xxx1
-    command('next! Xxx1 Xxx2 Xxx3')
-
-    -- Open window for all args
-    command('all')
-
-    -- Write contents of Xxx1
-    command('%yank A')
-
-    -- Append contents of last window (Xxx1)
-    feed('')
-    poke_eventloop()
-    command('%yank A')
-
-    -- should now be in Xxx2
-    command('rew')
-
-    -- Append contents of Xxx2
-    command('%yank A')
-
-    command('%d')
-    command('0put=@a')
-    command('$d')
-
-    eq(dedent([[
-      start of test file Xxx1
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx
-      start of test file Xxx1
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx
-      start of test file Xxx2
-          this is a test
-          this is a test
-          this is a test
-          this is a test
-      end of test file Xxx]]), curbuf_contents())
-  end)
-
-  teardown(function()
-    os.remove('Xxx1')
-    os.remove('Xxx2')
-    os.remove('Xxx3')
-  end)
-end)
diff --git a/test/functional/legacy/011_autocommands_spec.lua b/test/functional/legacy/011_autocommands_spec.lua
index 0fa9290f3c..7ae851467f 100644
--- a/test/functional/legacy/011_autocommands_spec.lua
+++ b/test/functional/legacy/011_autocommands_spec.lua
@@ -18,11 +18,11 @@ local clear, feed_command, expect, eq, neq, dedent, write_file, feed =
   helpers.clear, helpers.feed_command, helpers.expect, helpers.eq, helpers.neq,
   helpers.dedent, helpers.write_file, helpers.feed
 local command = helpers.command
-local iswin = helpers.iswin
 local read_file = helpers.read_file
+local is_os = helpers.is_os
 
 local function has_gzip()
-  local null = iswin() and 'nul' or '/dev/null'
+  local null = is_os('win') and 'nul' or '/dev/null'
   return os.execute('gzip --help >' .. null .. ' 2>&1') == 0
 end
 
diff --git a/test/functional/legacy/025_jump_tag_hidden_spec.lua b/test/functional/legacy/025_jump_tag_hidden_spec.lua
index dd89a3680e..15bd56a601 100644
--- a/test/functional/legacy/025_jump_tag_hidden_spec.lua
+++ b/test/functional/legacy/025_jump_tag_hidden_spec.lua
@@ -23,7 +23,7 @@ describe('jump to a tag with hidden set', function()
     feed_command('set hidden')
 
     -- Create a link from test25.dir to the current directory.
-    if helpers.iswin() then
+    if helpers.is_os('win') then
       feed_command('!rd /q/s test25.dir')
       feed_command('!mklink /j test25.dir .')
     else
@@ -33,7 +33,7 @@ describe('jump to a tag with hidden set', function()
 
     -- Create tags.text, with the current directory name inserted.
     feed_command('/tags line')
-    feed_command('r !' .. (helpers.iswin() and 'cd' or 'pwd'))
+    feed_command('r !' .. (helpers.is_os('win') and 'cd' or 'pwd'))
     feed('d$/test<cr>')
     feed('hP:.w! tags.test<cr>')
 
@@ -44,7 +44,7 @@ describe('jump to a tag with hidden set', function()
     feed('G<C-]> x:yank a<cr>')
     feed_command("call delete('tags.test')")
     feed_command("call delete('Xxx')")
-    if helpers.iswin() then
+    if helpers.is_os('win') then
       feed_command('!rd /q test25.dir')
     else
       feed_command('!rm -f test25.dir')
diff --git a/test/functional/legacy/030_fileformats_spec.lua b/test/functional/legacy/030_fileformats_spec.lua
index 15dbd05cf5..e88afd9c47 100644
--- a/test/functional/legacy/030_fileformats_spec.lua
+++ b/test/functional/legacy/030_fileformats_spec.lua
@@ -255,7 +255,7 @@ describe('fileformats option', function()
 
     -- Assert buffer contents.  This has to be done manually as
     -- helpers.expect() calls helpers.dedent() which messes up the white space
-    -- and carrige returns.
+    -- and carriage returns.
     eq(
       'unix\n'..
       'unix\n'..
diff --git a/test/functional/legacy/045_folding_spec.lua b/test/functional/legacy/045_folding_spec.lua
deleted file mode 100644
index 7d7856fd37..0000000000
--- a/test/functional/legacy/045_folding_spec.lua
+++ /dev/null
@@ -1,214 +0,0 @@
--- Tests for folding.
-local Screen = require('test.functional.ui.screen')
-
-local helpers = require('test.functional.helpers')(after_each)
-local feed, insert, feed_command, expect_any =
-  helpers.feed, helpers.insert, helpers.feed_command, helpers.expect_any
-
-describe('folding', function()
-  local screen
-
-  before_each(function()
-    helpers.clear()
-
-    screen = Screen.new(20, 8)
-    screen:attach()
-  end)
-
-  it('creation, opening, moving (to the end) and closing', function()
-    insert([[
-      1 aa
-      2 bb
-      3 cc
-      last
-      ]])
-
-    -- Basic test if a fold can be created, opened, moving to the end and
-    -- closed.
-    feed_command('1')
-    feed('zf2j')
-    feed_command('call append("$", "manual " . getline(foldclosed(".")))')
-    feed('zo')
-    feed_command('call append("$", foldclosed("."))')
-    feed(']z')
-    feed_command('call append("$", getline("."))')
-    feed('zc')
-    feed_command('call append("$", getline(foldclosed(".")))')
-
-    expect_any([[
-      manual 1 aa
-      -1
-      3 cc
-      1 aa]])
-  end)
-
-  it("foldmethod=marker", function()
-    screen:try_resize(20, 10)
-    insert([[
-      dd {{{
-      ee {{{ }}}
-      ff }}}
-    ]])
-    feed_command('set fdm=marker fdl=1')
-    feed_command('2')
-    feed_command('call append("$", "line 2 foldlevel=" . foldlevel("."))')
-    feed('[z')
-    feed_command('call append("$", foldlevel("."))')
-    feed('jo{{ <esc>r{jj') -- writes '{{{' and moves 2 lines bot
-    feed_command('call append("$", foldlevel("."))')
-    feed('kYpj')
-    feed_command('call append("$", foldlevel("."))')
-
-    helpers.poke_eventloop()
-    screen:expect([[
-        dd {{{            |
-        ee {{{ }}}        |
-      {{{                 |
-        ff }}}            |
-        ff }}}            |
-      ^                    |
-      line 2 foldlevel=2  |
-      1                   |
-      1                   |
-                          |
-    ]])
-
-  end)
-
-  it("foldmethod=indent", function()
-    screen:try_resize(20, 8)
-    feed_command('set fdm=indent sw=2')
-    insert([[
-    aa
-      bb
-        cc
-    last
-    ]])
-    feed_command('call append("$", "foldlevel line3=" . foldlevel(3))')
-    feed_command('call append("$", foldlevel(2))')
-    feed('zR')
-
-    helpers.poke_eventloop()
-    screen:expect([[
-      aa                  |
-        bb                |
-          cc              |
-      last                |
-      ^                    |
-      foldlevel line3=2   |
-      1                   |
-                          |
-    ]])
-  end)
-
-  it("foldmethod=syntax", function()
-    screen:try_resize(35, 15)
-    insert([[
-      1 aa
-      2 bb
-      3 cc
-      4 dd {{{
-      5 ee {{{ }}}
-      6 ff }}}
-      7 gg
-      8 hh
-      9 ii
-      a jj
-      b kk
-      last]])
-    feed_command('set fdm=syntax fdl=0')
-    feed_command('syn region Hup start="dd" end="ii" fold contains=Fd1,Fd2,Fd3')
-    feed_command('syn region Fd1 start="ee" end="ff" fold contained')
-    feed_command('syn region Fd2 start="gg" end="hh" fold contained')
-    feed_command('syn region Fd3 start="commentstart" end="commentend" fold contained')
-    feed('Gzk')
-    feed_command('call append("$", "folding " . getline("."))')
-    feed('k')
-    feed_command('call append("$", getline("."))')
-    feed('jAcommentstart  <esc>Acommentend<esc>')
-    feed_command('set fdl=1')
-    feed('3j')
-    feed_command('call append("$", getline("."))')
-    feed_command('set fdl=0')
-    feed('zO<C-L>j') -- <C-L> redraws screen
-    feed_command('call append("$", getline("."))')
-    feed_command('set fdl=0')
-    expect_any([[
-      folding 9 ii
-      3 cc
-      9 ii
-      a jj]])
-  end)
-
-  it("foldmethod=expression", function()
-    insert([[
-      1 aa
-      2 bb
-      3 cc
-      4 dd {{{
-      5 ee {{{ }}}
-      6 ff }}}
-      7 gg
-      8 hh
-      9 ii
-      a jj
-      b kk
-      last ]])
-
-    feed_command([[
-    fun Flvl()
-     let l = getline(v:lnum)
-     if l =~ "bb$"
-       return 2
-     elseif l =~ "gg$"
-       return "s1"
-     elseif l =~ "ii$"
-       return ">2"
-     elseif l =~ "kk$"
-       return "0"
-     endif
-     return "="
-    endfun
-    ]])
-    feed_command('set fdm=expr fde=Flvl()')
-    feed_command('/bb$')
-    feed_command('call append("$", "expr " . foldlevel("."))')
-    feed_command('/hh$')
-    feed_command('call append("$", foldlevel("."))')
-    feed_command('/ii$')
-    feed_command('call append("$", foldlevel("."))')
-    feed_command('/kk$')
-    feed_command('call append("$", foldlevel("."))')
-
-    expect_any([[
-      expr 2
-      1
-      2
-      0]])
-  end)
-
-  it('can be opened after :move', function()
-    -- luacheck: ignore
-    screen:try_resize(35, 8)
-    insert([[
-      Test fdm=indent and :move bug END
-      line2
-      	Test fdm=indent START
-      	line3
-      	line4]])
-    feed_command('set noai nosta ')
-    feed_command('set fdm=indent')
-    feed_command('1m1')
-    feed('2jzc')
-    feed_command('m0')
-    feed('zR')
-
-    expect_any([[
-      	Test fdm=indent START
-      	line3
-      	line4
-      Test fdm=indent and :move bug END
-      line2]])
-  end)
-end)
-
diff --git a/test/functional/legacy/055_list_and_dict_types_spec.lua b/test/functional/legacy/055_list_and_dict_types_spec.lua
index 4d71a526c1..75294b3786 100644
--- a/test/functional/legacy/055_list_and_dict_types_spec.lua
+++ b/test/functional/legacy/055_list_and_dict_types_spec.lua
@@ -330,214 +330,6 @@ describe('list and dictionary types', function()
       same list: 1]])
   end)
 
-  it('locked variables (part 1)', function()
-    source([=[
-      let l = []
-      for depth in range(5)
-	      $put ='depth is ' . depth
-	      for u in range(3)
-	        unlet l
-	        let l = [0, [1, [2, 3]], {4: 5, 6: {7: 8}}]
-	        exe "lockvar " . depth . " l"
-	        if u == 1
-	          exe "unlockvar l"
-	        elseif u == 2
-	          exe "unlockvar " . depth . " l"
-	        endif
-	        let ps = islocked("l") . islocked("l[1]") . islocked("l[1][1]") .
-	          \ islocked("l[1][1][0]") . '-' . islocked("l[2]") .
-	          \ islocked("l[2]['6']") . islocked("l[2]['6'][7]")
-	        $put =ps
-	        let ps = ''
-	        try
-	          let l[1][1][0] = 99
-	          let ps .= 'p'
-	        catch
-	          let ps .= 'F'
-	        endtry
-	        try
-	          let l[1][1] = [99]
-	          let ps .= 'p'
-	        catch
-	          let ps .= 'F'
-	        endtry
-	        try
-	          let l[1] = [99]
-	          let ps .= 'p'
-	        catch
-	          let ps .= 'F'
-	        endtry
-	        try
-	          let l[2]['6'][7] = 99
-	          let ps .= 'p'
-	        catch
-	          let ps .= 'F'
-	        endtry
-	        try
-	          let l[2][6] = {99: 99}
-	          let ps .= 'p'
-	        catch
-	          let ps .= 'F'
-	        endtry
-	        try
-	          let l[2] = {99: 99}
-	          let ps .= 'p'
-	        catch
-	          let ps .= 'F'
-	        endtry
-	        try
-	          let l = [99]
-	          let ps .= 'p'
-	        catch
-	          let ps .= 'F'
-	        endtry
-	        $put =ps
-	      endfor
-      endfor]=])
-    expect([[
-
-      depth is 0
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      depth is 1
-      1000-000
-      ppppppF
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      depth is 2
-      1100-100
-      ppFppFF
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      depth is 3
-      1110-110
-      pFFpFFF
-      0010-010
-      pFppFpp
-      0000-000
-      ppppppp
-      depth is 4
-      1111-111
-      FFFFFFF
-      0011-011
-      FFpFFpp
-      0000-000
-      ppppppp]])
-  end)
-
-  -- TODO In the original test the 5th line of this source() call was used.
-  -- But now the test only passes if I comment it.
-  it('unletting locked variables', function()
-    source([=[
-      let l = []
-      for depth in range(5)
-        $put ='depth is ' . depth
-        for u in range(3)
-          "unlet l
-          let l = [0, [1, [2, 3]], {4: 5, 6: {7: 8}}]
-          exe "lockvar " . depth . " l"
-          if u == 1
-            exe "unlockvar l"
-          elseif u == 2
-            exe "unlockvar " . depth . " l"
-          endif
-          let ps = islocked("l") . islocked("l[1]") . islocked("l[1][1]") .
-	          \ islocked("l[1][1][0]") . '-' . islocked("l[2]") .
-	          \ islocked("l[2]['6']") . islocked("l[2]['6'][7]")
-          $put =ps
-          let ps = ''
-          try
-            unlet l[2]['6'][7]
-            let ps .= 'p'
-          catch
-            let ps .= 'F'
-          endtry
-          try
-            unlet l[2][6]
-            let ps .= 'p'
-          catch
-            let ps .= 'F'
-          endtry
-          try
-            unlet l[2]
-            let ps .= 'p'
-          catch
-            let ps .= 'F'
-          endtry
-          try
-            unlet l[1][1][0]
-            let ps .= 'p'
-          catch
-            let ps .= 'F'
-          endtry
-          try
-            unlet l[1][1]
-            let ps .= 'p'
-          catch
-            let ps .= 'F'
-          endtry
-          try
-            unlet l[1]
-            let ps .= 'p'
-          catch
-            let ps .= 'F'
-          endtry
-          try
-            unlet l
-            let ps .= 'p'
-          catch
-            let ps .= 'F'
-          endtry
-          $put =ps
-        endfor
-      endfor]=])
-    expect([[
-
-      depth is 0
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      depth is 1
-      1000-000
-      ppFppFp
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      depth is 2
-      1100-100
-      pFFpFFp
-      0000-000
-      ppppppp
-      0000-000
-      ppppppp
-      depth is 3
-      1110-110
-      FFFFFFp
-      0010-010
-      FppFppp
-      0000-000
-      ppppppp
-      depth is 4
-      1111-111
-      FFFFFFp
-      0011-011
-      FppFppp
-      0000-000
-      ppppppp]])
-  end)
-
   it('locked variables and :unlet or list / dict functions', function()
     source([[
       $put ='Locks and commands or functions:'
@@ -676,30 +468,6 @@ describe('list and dictionary types', function()
       ['a', 'b', 3]]=])
   end)
 
-  it('locked variables (part 2)', function()
-    feed_command(
-      'let l = [1, 2, 3, 4]',
-      'lockvar! l',
-      '$put =string(l)',
-      'unlockvar l[1]',
-      'unlet l[0:1]',
-      '$put =string(l)',
-      'unlet l[1:2]',
-      '$put =string(l)',
-      'unlockvar l[1]',
-      'let l[0:1] = [0, 1]',
-      '$put =string(l)',
-      'let l[1:2] = [0, 1]',
-      '$put =string(l)')
-    expect([=[
-
-      [1, 2, 3, 4]
-      [1, 2, 3, 4]
-      [1, 2, 3, 4]
-      [1, 2, 3, 4]
-      [1, 2, 3, 4]]=])
-  end)
-
   it(':lockvar/islocked() triggering script autoloading.', function()
     source([[           
       set rtp+=test/functional/fixtures
@@ -907,7 +675,7 @@ describe('list and dictionary types', function()
     feed('o<C-R>=a<CR><esc>')
     feed_command('lang C')
     feed_command('redir => a')
-    -- The test failes if this is not in one line.
+    -- The test fails if this is not in one line.
     feed_command("try|foobar|catch|let a = matchstr(v:exception,'^[^ ]*')|endtry")
     feed_command('redir END')
     feed('o<C-R>=a<CR><esc>')
diff --git a/test/functional/legacy/063_match_and_matchadd_spec.lua b/test/functional/legacy/063_match_and_matchadd_spec.lua
index d164d9c02f..235a826640 100644
--- a/test/functional/legacy/063_match_and_matchadd_spec.lua
+++ b/test/functional/legacy/063_match_and_matchadd_spec.lua
@@ -3,10 +3,8 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 
-local eval, clear, command = helpers.eval, helpers.clear, helpers.command
-local eq, neq = helpers.eq, helpers.neq
+local clear, command = helpers.clear, helpers.command
 local insert = helpers.insert
-local pcall_err = helpers.pcall_err
 
 describe('063: Test for ":match", "matchadd()" and related functions', function()
   setup(clear)
@@ -19,105 +17,9 @@ describe('063: Test for ":match", "matchadd()" and related functions', function(
       [1] = {background = Screen.colors.Red},
     })
 
-    -- Check that "matcharg()" returns the correct group and pattern if a match
-    -- is defined.
     command("highlight MyGroup1 term=bold ctermbg=red guibg=red")
     command("highlight MyGroup2 term=italic ctermbg=green guibg=green")
     command("highlight MyGroup3 term=underline ctermbg=blue guibg=blue")
-    command("match MyGroup1 /TODO/")
-    command("2match MyGroup2 /FIXME/")
-    command("3match MyGroup3 /XXX/")
-    eq({'MyGroup1', 'TODO'}, eval('matcharg(1)'))
-    eq({'MyGroup2', 'FIXME'}, eval('matcharg(2)'))
-    eq({'MyGroup3', 'XXX'}, eval('matcharg(3)'))
-
-    -- Check that "matcharg()" returns an empty list if the argument is not 1,
-    -- 2 or 3 (only 0 and 4 are tested).
-    eq({}, eval('matcharg(0)'))
-    eq({}, eval('matcharg(4)'))
-
-    -- Check that "matcharg()" returns ['', ''] if a match is not defined.
-    command("match")
-    command("2match")
-    command("3match")
-    eq({'', ''}, eval('matcharg(1)'))
-    eq({'', ''}, eval('matcharg(2)'))
-    eq({'', ''}, eval('matcharg(3)'))
-
-    -- Check that "matchadd()" and "getmatches()" agree on added matches and
-    -- that default values apply.
-    command("let m1 = matchadd('MyGroup1', 'TODO')")
-    command("let m2 = matchadd('MyGroup2', 'FIXME', 42)")
-    command("let m3 = matchadd('MyGroup3', 'XXX', 60, 17)")
-    eq({{group = 'MyGroup1', pattern = 'TODO', priority = 10, id = 4},
-        {group = 'MyGroup2', pattern = 'FIXME', priority = 42, id = 5},
-        {group = 'MyGroup3', pattern = 'XXX', priority = 60, id = 17}},
-      eval('getmatches()'))
-
-    -- Check that "matchdelete()" deletes the matches defined in the previous
-    -- test correctly.
-    command("call matchdelete(m1)")
-    command("call matchdelete(m2)")
-    command("call matchdelete(m3)")
-    eq({}, eval('getmatches()'))
-
-    --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
-    command("let m = matchadd('MyGroup1', 'TODO')")
-    eq(0, eval('matchdelete(m)'))
-
-    -- matchdelete throws error and returns -1 on failure
-    neq(true, pcall(function() eval('matchdelete(42)') end))
-    eq('Vim(let):E803: ID not found: 42', pcall_err(command, 'let r2 = matchdelete(42)'))
-
-    -- Check that "clearmatches()" clears all matches defined by ":match" and
-    -- "matchadd()".
-    command("let m1 = matchadd('MyGroup1', 'TODO')")
-    command("let m2 = matchadd('MyGroup2', 'FIXME', 42)")
-    command("let m3 = matchadd('MyGroup3', 'XXX', 60, 17)")
-    command("match MyGroup1 /COFFEE/")
-    command("2match MyGroup2 /HUMPPA/")
-    command("3match MyGroup3 /VIM/")
-    command("call clearmatches()")
-    eq({}, eval('getmatches()'))
-
-    -- Check that "setmatches()" restores a list of matches saved by
-    -- "getmatches()" without changes. (Matches with equal priority must also
-    -- remain in the same order.)
-    command("let m1 = matchadd('MyGroup1', 'TODO')")
-    command("let m2 = matchadd('MyGroup2', 'FIXME', 42)")
-    command("let m3 = matchadd('MyGroup3', 'XXX', 60, 17)")
-    command("match MyGroup1 /COFFEE/")
-    command("2match MyGroup2 /HUMPPA/")
-    command("3match MyGroup3 /VIM/")
-    command("let ml = getmatches()")
-    local ml = eval("ml")
-    command("call clearmatches()")
-    command("call setmatches(ml)")
-    eq(ml, eval('getmatches()'))
-
-    -- Check that "setmatches()" can correctly restore the matches from matchaddpos()
-    command("call clearmatches()")
-    command("call setmatches(ml)")
-    eq(ml, eval('getmatches()'))
-
-    -- Check that "setmatches()" will not add two matches with the same ID. The
-    -- expected behaviour (for now) is to add the first match but not the
-    -- second and to return -1.
-    eq('Vim(let):E801: ID already taken: 1',
-       pcall_err(command, "let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])"))
-    eq({{group = 'MyGroup1', pattern = 'TODO', priority = 10, id = 1}}, eval('getmatches()'))
-
-    -- Check that "setmatches()" returns 0 if successful and otherwise -1.
-    -- (A range of valid and invalid input values are tried out to generate the
-    -- return values.)
-    eq(0,eval("setmatches([])"))
-    eq(0,eval("setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}])"))
-    command("call clearmatches()")
-    eq('Vim(let):E714: List required', pcall_err(command, 'let rf1 = setmatches(0)'))
-    eq('Vim(let):E474: List item 0 is either not a dictionary or an empty one',
-       pcall_err(command, 'let rf2 = setmatches([0])'))
-    eq('Vim(let):E474: List item 0 is missing one of the required keys',
-       pcall_err(command, "let rf3 = setmatches([{'wrong key': 'wrong value'}])"))
 
     -- Check that "matchaddpos()" positions matches correctly
     insert('abcdefghijklmnopq')
diff --git a/test/functional/legacy/072_undo_file_spec.lua b/test/functional/legacy/072_undo_file_spec.lua
index b4927e779e..80665027c3 100644
--- a/test/functional/legacy/072_undo_file_spec.lua
+++ b/test/functional/legacy/072_undo_file_spec.lua
@@ -69,7 +69,7 @@ describe('72', function()
     feed_command('set undofile ul=100')
     feed('uuuuuu:w >>test.out<cr>')
 
-    ---- Open the output to see if it meets the expections
+    ---- Open the output to see if it meets the expectations
     feed_command('e! test.out')
 
     -- Assert buffer contents.
diff --git a/test/functional/legacy/083_tag_search_