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

11 files changed, 241 insertions, 90 deletions

diff --git a/test/functional/api/autocmd_spec.lua b/test/functional/api/autocmd_spec.lua
index a923f5df0e..22a1311ee9 100644
--- a/test/functional/api/autocmd_spec.lua
+++ b/test/functional/api/autocmd_spec.lua
@@ -14,14 +14,14 @@ before_each(clear)
 
 describe('autocmd api', function()
   describe('nvim_create_autocmd', function()
-    it('does not allow "command" and "callback" in the same autocmd', function()
-      local ok, _ = pcall(meths.create_autocmd, "BufReadPost", {
+    it('"command" and "callback" are mutually exclusive', function()
+      local rv = pcall_err(meths.create_autocmd, "BufReadPost", {
         pattern = "*.py,*.pyi",
         command = "echo 'Should Have Errored",
-        callback = "not allowed",
+        callback = "NotAllowed",
       })
 
-      eq(false, ok)
+      eq("specify either 'callback' or 'command', not both", rv)
     end)
 
     it('doesnt leak when you use ++once', function()
@@ -60,13 +60,13 @@ describe('autocmd api', function()
     end)
 
     it('does not allow passing buffer and patterns', function()
-      local ok = pcall(meths.create_autocmd, "Filetype", {
+      local rv = pcall_err(meths.create_autocmd, "Filetype", {
         command = "let g:called = g:called + 1",
         buffer = 0,
         pattern = "*.py",
       })
 
-      eq(false, ok)
+      eq("cannot pass both: 'pattern' and 'buffer' for the same autocmd", rv)
     end)
 
     it('does not allow passing invalid buffers', function()
@@ -613,6 +613,20 @@ describe('autocmd api', function()
         eq(false, success)
         matches("'group' must be a string or an integer", code)
       end)
+
+      it('raises error for invalid pattern array', function()
+        local success, code = unpack(meths.exec_lua([[
+          return {pcall(function()
+            vim.api.nvim_create_autocmd("FileType", {
+              pattern = {{}},
+              command = "echo 'hello'",
+            })
+          end)}
+        ]], {}))
+
+        eq(false, success)
+        matches("All entries in 'pattern' must be strings", code)
+      end)
     end)
 
     describe('patterns', function()
diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua
index 8f6fc666c9..6b13729994 100644
--- a/test/functional/api/buffer_spec.lua
+++ b/test/functional/api/buffer_spec.lua
@@ -3,6 +3,7 @@ local Screen = require('test.functional.ui.screen')
 local clear, nvim, buffer = helpers.clear, helpers.nvim, helpers.buffer
 local curbuf, curwin, eq = helpers.curbuf, helpers.curwin, helpers.eq
 local curbufmeths, ok = helpers.curbufmeths, helpers.ok
+local describe_lua_and_rpc = helpers.describe_lua_and_rpc(describe)
 local meths = helpers.meths
 local funcs = helpers.funcs
 local request = helpers.request
@@ -185,12 +186,13 @@ describe('api/buf', function()
     end)
   end)
 
-  describe('nvim_buf_get_lines, nvim_buf_set_lines', function()
-    local get_lines, set_lines = curbufmeths.get_lines, curbufmeths.set_lines
-    local line_count = curbufmeths.line_count
+  describe_lua_and_rpc('nvim_buf_get_lines, nvim_buf_set_lines', function(api)
+    local get_lines = api.curbufmeths.get_lines
+    local set_lines = api.curbufmeths.set_lines
+    local line_count = api.curbufmeths.line_count
 
     it('fails correctly when input is not valid', function()
-      eq(1, curbufmeths.get_number())
+      eq(1, api.curbufmeths.get_number())
       eq([[String cannot contain newlines]],
         pcall_err(bufmeths.set_lines, 1, 1, 2, false, {'b\na'}))
     end)
@@ -198,7 +200,7 @@ describe('api/buf', function()
     it("fails if 'nomodifiable'", function()
       command('set nomodifiable')
       eq([[Buffer is not 'modifiable']],
-        pcall_err(bufmeths.set_lines, 1, 1, 2, false, {'a','b'}))
+        pcall_err(api.bufmeths.set_lines, 1, 1, 2, false, {'a','b'}))
     end)
 
     it('has correct line_count when inserting and deleting', function()
@@ -354,7 +356,7 @@ describe('api/buf', function()
         Who would win?
         A real window
         with proper text]])
-      local buf = meths.create_buf(false,true)
+      local buf = api.meths.create_buf(false,true)
       screen:expect([[
         Who would win?      |
         A real window       |
@@ -363,7 +365,7 @@ describe('api/buf', function()
                             |
       ]])
 
-      meths.buf_set_lines(buf, 0, -1, true, {'or some', 'scratchy text'})
+      api.meths.buf_set_lines(buf, 0, -1, true, {'or some', 'scratchy text'})
       feed('i') -- provoke redraw
       screen:expect([[
         Who would win?      |
@@ -379,15 +381,15 @@ describe('api/buf', function()
         visible buffer line 1
         line 2
       ]])
-      local hiddenbuf = meths.create_buf(false,true)
+      local hiddenbuf = api.meths.create_buf(false,true)
       command('vsplit')
       command('vsplit')
       feed('<c-w>l<c-w>l<c-w>l')
       eq(3, funcs.winnr())
       feed('<c-w>h')
       eq(2, funcs.winnr())
-      meths.buf_set_lines(hiddenbuf, 0, -1, true,
-                          {'hidden buffer line 1', 'line 2'})
+      api.meths.buf_set_lines(hiddenbuf, 0, -1, true,
+                              {'hidden buffer line 1', 'line 2'})
       feed('<c-w>p')
       eq(3, funcs.winnr())
     end)
@@ -579,13 +581,13 @@ describe('api/buf', function()
     end)
   end)
 
-  describe('nvim_buf_get_text', function()
-    local get_text = curbufmeths.get_text
-
+  describe_lua_and_rpc('nvim_buf_get_text', function(api)
+    local get_text = api.curbufmeths.get_text
     before_each(function()
       insert([[
       hello foo!
-      text]])
+      text
+      more]])
     end)
 
     it('works', function()
@@ -593,16 +595,17 @@ describe('api/buf', function()
       eq({'hello foo!'}, get_text(0, 0, 0, 42, {}))
       eq({'foo!'}, get_text(0, 6, 0, 10, {}))
       eq({'foo!', 'tex'}, get_text(0, 6, 1, 3, {}))
-      eq({'foo!', 'tex'}, get_text(-2, 6, -1, 3, {}))
+      eq({'foo!', 'tex'}, get_text(-3, 6, -2, 3, {}))
       eq({''}, get_text(0, 18, 0, 20, {}))
-      eq({'ext'}, get_text(-1, 1, -1, 4, {}))
+      eq({'ext'}, get_text(-2, 1, -2, 4, {}))
+      eq({'hello foo!', 'text', 'm'}, get_text(0, 0, 2, 1, {}))
     end)
 
     it('errors on out-of-range', function()
-      eq('Index out of bounds', pcall_err(get_text, 2, 0, 3, 0, {}))
-      eq('Index out of bounds', pcall_err(get_text, -3, 0, 0, 0, {}))
-      eq('Index out of bounds', pcall_err(get_text, 0, 0, 2, 0, {}))
-      eq('Index out of bounds', pcall_err(get_text, 0, 0, -3, 0, {}))
+      eq('Index out of bounds', pcall_err(get_text, 2, 0, 4, 0, {}))
+      eq('Index out of bounds', pcall_err(get_text, -4, 0, 0, 0, {}))
+      eq('Index out of bounds', pcall_err(get_text, 0, 0, 3, 0, {}))
+      eq('Index out of bounds', pcall_err(get_text, 0, 0, -4, 0, {}))
       -- no ml_get errors should happen #19017
       eq('', meths.get_vvar('errmsg'))
     end)
diff --git a/test/functional/api/buffer_updates_spec.lua b/test/functional/api/buffer_updates_spec.lua
index 3d257e9477..d5f06c8f1f 100644
--- a/test/functional/api/buffer_updates_spec.lua
+++ b/test/functional/api/buffer_updates_spec.lua
@@ -810,7 +810,7 @@ describe('API: buffer events:', function()
         local newlines = args[5]
 
         -- Size of the contained nvim instance is 23 lines, this might change
-        -- with the test setup. Note updates are continguous.
+        -- with the test setup. Note updates are contiguous.
         assert(#newlines <= 23)
 
         for i = 1,#newlines do
diff --git a/test/functional/api/command_spec.lua b/test/functional/api/command_spec.lua
index f19d7a362b..d0fb26edc7 100644
--- a/test/functional/api/command_spec.lua
+++ b/test/functional/api/command_spec.lua
@@ -114,6 +114,7 @@ describe('nvim_create_user_command', function()
     ]]
 
     eq({
+      name = "CommandWithLuaCallback",
       args = [[this\  is    a\ test]],
       fargs = {"this ", "is", "a test"},
       bang = false,
@@ -150,6 +151,7 @@ describe('nvim_create_user_command', function()
     ]=])
 
     eq({
+      name = "CommandWithLuaCallback",
       args = [[this   includes\ a backslash: \\]],
       fargs = {"this", "includes a", "backslash:", "\\"},
       bang = false,
@@ -186,6 +188,7 @@ describe('nvim_create_user_command', function()
     ]=])
 
     eq({
+      name = "CommandWithLuaCallback",
       args = "a\\b",
       fargs = {"a\\b"},
       bang = false,
@@ -222,6 +225,7 @@ describe('nvim_create_user_command', function()
     ]=])
 
     eq({
+      name = "CommandWithLuaCallback",
       args = 'h\tey ',
       fargs = {[[h]], [[ey]]},
       bang = true,
@@ -258,6 +262,7 @@ describe('nvim_create_user_command', function()
     ]=])
 
     eq({
+      name = "CommandWithLuaCallback",
       args = "h",
       fargs = {"h"},
       bang = false,
@@ -294,6 +299,7 @@ describe('nvim_create_user_command', function()
     ]])
 
     eq({
+      name = "CommandWithLuaCallback",
       args = "",
       fargs = {},  -- fargs works without args
       bang = false,
@@ -342,6 +348,7 @@ describe('nvim_create_user_command', function()
     ]]
 
     eq({
+      name = "CommandWithOneOrNoArg",
       args = "hello I'm one argument",
       fargs = {"hello I'm one argument"},  -- Doesn't split args
       bang = false,
@@ -379,6 +386,7 @@ describe('nvim_create_user_command', function()
 
     -- f-args is an empty table if no args were passed
     eq({
+      name = "CommandWithOneOrNoArg",
       args = "",
       fargs = {},
       bang = false,
@@ -427,6 +435,7 @@ describe('nvim_create_user_command', function()
       })
     ]]
     eq({
+      name = "CommandWithNoArgs",
       args = "",
       fargs = {},
       bang = false,
@@ -463,6 +472,7 @@ describe('nvim_create_user_command', function()
     ]])
     -- register can be specified
     eq({
+      name = "CommandWithNoArgs",
       args = "",
       fargs = {},
       bang = false,
diff --git a/test/functional/api/highlight_spec.lua b/test/functional/api/highlight_spec.lua
index 3b36563d21..5941d4c68b 100644
--- a/test/functional/api/highlight_spec.lua
+++ b/test/functional/api/highlight_spec.lua
@@ -11,6 +11,9 @@ local ok = helpers.ok
 local assert_alive = helpers.assert_alive
 
 describe('API: highlight',function()
+  clear()
+  Screen.new() -- initialize Screen.colors
+
   local expected_rgb = {
     background = Screen.colors.Yellow,
     foreground = Screen.colors.Red,
@@ -29,13 +32,16 @@ describe('API: highlight',function()
     italic = true,
     reverse = true,
     underline = true,
-    undercurl = true,
-    underdouble = true,
-    underdotted = true,
-    underdashed = true,
     strikethrough = true,
+    altfont = true,
     nocombine = true,
   }
+  local expected_undercurl = {
+    background = Screen.colors.Yellow,
+    foreground = Screen.colors.Red,
+    special = Screen.colors.Blue,
+    undercurl = true,
+  }
 
   before_each(function()
     clear()
@@ -56,9 +62,13 @@ describe('API: highlight',function()
     eq('Invalid highlight id: 30000', string.match(emsg, 'Invalid.*'))
 
     -- Test all highlight properties.
-    command('hi NewHighlight gui=underline,bold,undercurl,underdouble,underdotted,underdashed,italic,reverse,strikethrough,nocombine')
+    command('hi NewHighlight gui=underline,bold,italic,reverse,strikethrough,altfont,nocombine')
     eq(expected_rgb2, nvim("get_hl_by_id", hl_id, true))
 
+    -- Test undercurl
+    command('hi NewHighlight gui=undercurl')
+    eq(expected_undercurl, nvim("get_hl_by_id", hl_id, true))
+
     -- Test nil argument.
     err, emsg = pcall(meths.get_hl_by_id, { nil }, false)
     eq(false, err)
@@ -204,17 +214,14 @@ describe("API: set highlight", function()
     bold = true,
     italic = true,
     reverse = true,
-    undercurl = true,
     underline = true,
-    underdashed = true,
-    underdotted = true,
-    underdouble = true,
     strikethrough = true,
+    altfont = true,
     cterm = {
       italic = true,
       reverse = true,
-      undercurl = true,
       strikethrough = true,
+      altfont = true,
       nocombine = true,
     }
   }
@@ -224,20 +231,17 @@ describe("API: set highlight", function()
     bold = true,
     italic = true,
     reverse = true,
-    undercurl = true,
     underline = true,
-    underdashed = true,
-    underdotted = true,
-    underdouble = true,
     strikethrough = true,
+    altfont = true,
   }
   local highlight3_result_cterm = {
     background = highlight_color.ctermbg,
     foreground = highlight_color.ctermfg,
     italic = true,
     reverse = true,
-    undercurl = true,
     strikethrough = true,
+    altfont = true,
     nocombine = true,
   }
 
@@ -293,7 +297,7 @@ describe("API: set highlight", function()
       exec_capture('highlight Test_hl'))
 
     meths.set_hl(0, 'Test_hl2', highlight3_config)
-    eq('Test_hl2       xxx cterm=undercurl,italic,reverse,strikethrough,nocombine ctermfg=8 ctermbg=15 gui=bold,underline,undercurl,underdouble,underdotted,underdashed,italic,reverse,strikethrough guifg=#ff0000 guibg=#0032aa',
+    eq('Test_hl2       xxx cterm=italic,reverse,strikethrough,altfont,nocombine ctermfg=8 ctermbg=15 gui=bold,underline,italic,reverse,strikethrough,altfont guifg=#ff0000 guibg=#0032aa',
       exec_capture('highlight Test_hl2'))
 
     -- Colors are stored with the name they are defined, but
diff --git a/test/functional/api/keymap_spec.lua b/test/functional/api/keymap_spec.lua
index 30c351b26a..5be4425162 100644
--- a/test/functional/api/keymap_spec.lua
+++ b/test/functional/api/keymap_spec.lua
@@ -1066,7 +1066,7 @@ describe('nvim_buf_set_keymap, nvim_buf_del_keymap', function()
     eq({'rhs'}, bufmeths.get_lines(0, 0, 1, 1))
   end)
 
-  it("does not crash when setting keymap in a non-existing buffer #13541", function()
+  it("does not crash when setting mapping in a non-existing buffer #13541", function()
     pcall_err(bufmeths.set_keymap, 100, '', 'lsh', 'irhs<Esc>', {})
     helpers.assert_alive()
   end)
diff --git a/test/functional/api/proc_spec.lua b/test/functional/api/proc_spec.lua
index 0fbf58a8e7..2028a8fba5 100644
--- a/test/functional/api/proc_spec.lua
+++ b/test/functional/api/proc_spec.lua
@@ -3,12 +3,12 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local funcs = helpers.funcs
-local iswin = helpers.iswin
 local neq = helpers.neq
 local nvim_argv = helpers.nvim_argv
 local request = helpers.request
 local retry = helpers.retry
 local NIL = helpers.NIL
+local is_os = helpers.is_os
 
 describe('API', function()
   before_each(clear)
@@ -19,26 +19,26 @@ describe('API', function()
 
       -- Might be non-zero already (left-over from some other test?),
       -- but this is not what is tested here.
-      local initial_childs = request('nvim_get_proc_children', this_pid)
+      local initial_children = request('nvim_get_proc_children', this_pid)
 
       local job1 = funcs.jobstart(nvim_argv)
       retry(nil, nil, function()
-        eq(#initial_childs + 1, #request('nvim_get_proc_children', this_pid))
+        eq(#initial_children + 1, #request('nvim_get_proc_children', this_pid))
       end)
 
       local job2 = funcs.jobstart(nvim_argv)
       retry(nil, nil, function()
-        eq(#initial_childs + 2, #request('nvim_get_proc_children', this_pid))
+        eq(#initial_children + 2, #request('nvim_get_proc_children', this_pid))
       end)
 
       funcs.jobstop(job1)
       retry(nil, nil, function()
-        eq(#initial_childs + 1, #request('nvim_get_proc_children', this_pid))
+        eq(#initial_children + 1, #request('nvim_get_proc_children', this_pid))
       end)
 
       funcs.jobstop(job2)
       retry(nil, nil, function()
-        eq(#initial_childs, #request('nvim_get_proc_children', this_pid))
+        eq(#initial_children, #request('nvim_get_proc_children', this_pid))
       end)
     end)
 
@@ -62,7 +62,7 @@ describe('API', function()
     it('returns process info', function()
       local pid = funcs.getpid()
       local pinfo = request('nvim_get_proc', pid)
-      eq((iswin() and 'nvim.exe' or 'nvim'), pinfo.name)
+      eq((is_os('win') and 'nvim.exe' or 'nvim'), pinfo.name)
       eq(pid, pinfo.pid)
       eq('number', type(pinfo.ppid))
       neq(pid, pinfo.ppid)
diff --git a/test/functional/api/server_notifications_spec.lua b/test/functional/api/server_notifications_spec.lua
index 1c554b05a3..53642858b2 100644
--- a/test/functional/api/server_notifications_spec.lua
+++ b/test/functional/api/server_notifications_spec.lua
@@ -1,13 +1,16 @@
 local helpers = require('test.functional.helpers')(after_each)
+local assert_log = helpers.assert_log
 local eq, clear, eval, command, nvim, next_msg =
   helpers.eq, helpers.clear, helpers.eval, helpers.command, helpers.nvim,
   helpers.next_msg
 local meths = helpers.meths
 local exec_lua = helpers.exec_lua
 local retry = helpers.retry
-local isCI = helpers.isCI
+local is_ci = helpers.is_ci
 local assert_alive = helpers.assert_alive
-local uname = helpers.uname
+local skip = helpers.skip
+
+local testlog = 'Xtest-server-notify-log'
 
 describe('notify', function()
   local channel
@@ -17,6 +20,10 @@ describe('notify', function()
     channel = nvim('get_api_info')[1]
   end)
 
+  after_each(function()
+    os.remove(testlog)
+  end)
+
   describe('passing a valid channel id', function()
     it('sends the notification/args to the corresponding channel', function()
       eval('rpcnotify('..channel..', "test-event", 1, 2, 3)')
@@ -72,23 +79,18 @@ describe('notify', function()
   end)
 
   it('unsubscribe non-existing event #8745', function()
+    clear{env={
+      NVIM_LOG_FILE=testlog,
+    }}
     nvim('subscribe', 'event1')
     nvim('unsubscribe', 'doesnotexist')
+    assert_log("tried to unsubscribe unknown event 'doesnotexist'", testlog, 10)
     nvim('unsubscribe', 'event1')
     assert_alive()
   end)
 
   it('cancels stale events on channel close', function()
-    if uname() == 'freebsd' then
-      pending('Failing FreeBSD test')
-    end
-    if isCI() then
-      pending('hangs on CI #14083 #15251')
-      return
-    elseif helpers.skip_fragile(pending) then
-      return
-    end
-    if helpers.pending_win32(pending) then return end
+    skip(is_ci(), 'hangs on CI #14083 #15251')
     local catchan = eval("jobstart(['cat'], {'rpc': v:true})")
     local catpath = eval('exepath("cat")')
     eq({id=catchan, argv={catpath}, stream='job', mode='rpc', client = {}}, exec_lua ([[
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index 00a4dd041d..ceff390dc5 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -250,7 +250,7 @@ describe('server -> client', function()
       pcall(funcs.jobstop, jobid)
     end)
 
-    if helpers.pending_win32(pending) then return end
+    if helpers.skip(helpers.is_os('win')) then return end
 
     it('rpc and text stderr can be combined', function()
       local status, rv = pcall(funcs.rpcrequest, jobid, 'poll')
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index af6cee7e90..8fcdd9620b 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -12,7 +12,6 @@ local exec = helpers.exec
 local eval = helpers.eval
 local expect = helpers.expect
 local funcs = helpers.funcs
-local iswin = helpers.iswin
 local meths = helpers.meths
 local matches = helpers.matches
 local pesc = helpers.pesc
@@ -30,6 +29,7 @@ local exec_lua = helpers.exec_lua
 local exc_exec = helpers.exc_exec
 local insert = helpers.insert
 local expect_exit = helpers.expect_exit
+local skip = helpers.skip
 
 local pcall_err = helpers.pcall_err
 local format_string = helpers.format_string
@@ -166,7 +166,7 @@ describe('API', function()
           echo nvim_exec('echo Avast_ye_hades(''ahoy!'')', 1)
         ]], true))
 
-      eq('Vim(call):E5555: API call: Vim(echo):E121: Undefined variable: s:pirate',
+      matches('Vim%(echo%):E121: Undefined variable: s:pirate$',
         pcall_err(request, 'nvim_exec', [[
           let s:pirate = 'script-scoped varrrrr'
           call nvim_exec('echo s:pirate', 1)
@@ -208,12 +208,12 @@ describe('API', function()
     end)
 
     it('execution error', function()
-      eq('Vim:E492: Not an editor command: bogus_command',
+      eq('nvim_exec(): Vim:E492: Not an editor command: bogus_command',
         pcall_err(request, 'nvim_exec', 'bogus_command', false))
       eq('', nvim('eval', 'v:errmsg'))  -- v:errmsg was not updated.
       eq('', eval('v:exception'))
 
-      eq('Vim(buffer):E86: Buffer 23487 does not exist',
+      eq('nvim_exec(): Vim(buffer):E86: Buffer 23487 does not exist',
         pcall_err(request, 'nvim_exec', 'buffer 23487', false))
       eq('', eval('v:errmsg'))  -- v:errmsg was not updated.
       eq('', eval('v:exception'))
@@ -399,7 +399,7 @@ describe('API', function()
     end)
 
     it('returns shell |:!| output', function()
-      local win_lf = iswin() and '\r' or ''
+      local win_lf = is_os('win') and '\r' or ''
       eq(':!echo foo\r\n\nfoo'..win_lf..'\n', nvim('command_output', [[!echo foo]]))
     end)
 
@@ -485,7 +485,7 @@ describe('API', function()
           throw 'wtf'
         endfunction
       ]])
-      eq('wtf', pcall_err(request, 'nvim_call_function', 'Foo', {}))
+      eq('function Foo, line 1: wtf', pcall_err(request, 'nvim_call_function', 'Foo', {}))
       eq('', eval('v:exception'))
       eq('', eval('v:errmsg'))  -- v:errmsg was not updated.
     end)
@@ -604,10 +604,10 @@ describe('API', function()
       eq([[Error loading lua: [string "<nvim>"]:0: unexpected symbol]],
         pcall_err(meths.exec_lua, 'aa=bb\0', {}))
 
-      eq([[Error executing lua: [string "<nvim>"]:0: attempt to call global 'bork' (a nil value)]],
+      eq([[attempt to call global 'bork' (a nil value)]],
         pcall_err(meths.exec_lua, 'bork()', {}))
 
-      eq('Error executing lua: [string "<nvim>"]:0: did\nthe\nfail',
+      eq('did\nthe\nfail',
         pcall_err(meths.exec_lua, 'error("did\\nthe\\nfail")', {}))
     end)
 
@@ -1108,6 +1108,14 @@ describe('API', function()
       nvim('paste', 'a', true, -1)
       eq('a', funcs.getcmdline())
     end)
+    it('pasted text is saved in cmdline history when <CR> comes from mapping #20957', function()
+      command('cnoremap <CR> <CR>')
+      feed(':')
+      nvim('paste', 'echo', true, -1)
+      eq('', funcs.histget(':'))
+      feed('<CR>')
+      eq('echo', funcs.histget(':'))
+    end)
     it('pasting with empty last chunk in Cmdline mode', function()
       local screen = Screen.new(20, 4)
       screen:attach()
@@ -1140,7 +1148,7 @@ describe('API', function()
     end)
     it('vim.paste() failure', function()
       nvim('exec_lua', 'vim.paste = (function(lines, phase) error("fake fail") end)', {})
-      eq([[Error executing lua: [string "<nvim>"]:0: fake fail]],
+      eq('fake fail',
         pcall_err(request, 'nvim_paste', 'line 1\nline 2\nline 3', false, 1))
     end)
   end)
@@ -1799,9 +1807,11 @@ describe('API', function()
         },
 
         ['jumps'] = eval(([[
-        filter(map(getjumplist()[0], 'filter(
-          { "f": expand("#".v:val.bufnr.":p"), "l": v:val.lnum },
-          { k, v -> k != "l" || v != 1 })'), '!empty(v:val.f)')
+        filter(map(add(
+        getjumplist()[0], { 'bufnr': bufnr('%'), 'lnum': getcurpos()[1] }),
+        'filter(
+        { "f": expand("#".v:val.bufnr.":p"), "l": v:val.lnum },
+        { k, v -> k != "l" || v != 1 })'), '!empty(v:val.f)')
         ]]):gsub('\n', '')),
 
         ['bufs'] = eval([[
@@ -2116,7 +2126,7 @@ describe('API', function()
         pty='?',
       }
       local event = meths.get_var("opened_event")
-      if not iswin() then
+      if not is_os('win') then
         info.pty = event.info.pty
         neq(nil, string.match(info.pty, "^/dev/"))
       end
@@ -2132,7 +2142,7 @@ describe('API', function()
         stream = 'job',
         id = 4,
         argv = (
-          iswin() and {
+          is_os('win') and {
             eval('&shell'),
             '/s',
             '/c',
@@ -2154,7 +2164,7 @@ describe('API', function()
       -- :terminal with args + stopped process.
       eq(1, eval('jobstop(&channel)'))
       eval('jobwait([&channel], 1000)')  -- Wait.
-      expected2.pty = (iswin() and '?' or '')  -- pty stream was closed.
+      expected2.pty = (is_os('win') and '?' or '')  -- pty stream was closed.
       eq(expected2, eval('nvim_get_chan_info(&channel)'))
     end)
   end)
@@ -2315,12 +2325,6 @@ describe('API', function()
       meths.set_option('isident', '')
     end)
 
-    local it_maybe_pending = it
-    if helpers.isCI() and os.getenv('CONFIGURATION') == 'MSVC_32' then
-      -- For "works with &opt" (flaky on MSVC_32), but not easy to skip alone.  #10241
-      it_maybe_pending = pending
-    end
-
     local function simplify_east_api_node(line, east_api_node)
       if east_api_node == NIL then
         return nil
@@ -2517,7 +2521,7 @@ describe('API', function()
       end
     end
     require('test.unit.viml.expressions.parser_tests')(
-        it_maybe_pending, _check_parsing, hl, fmtn)
+        it, _check_parsing, hl, fmtn)
   end)
 
   describe('nvim_list_uis', function()
@@ -2721,7 +2725,7 @@ describe('API', function()
       eq({}, meths.get_runtime_file("foobarlang/", true))
     end)
     it('can handle bad patterns', function()
-      if helpers.pending_win32(pending) then return end
+      skip(is_os('win'))
 
       eq("Vim:E220: Missing }.", pcall_err(meths.get_runtime_file, "{", false))
 
@@ -3040,7 +3044,7 @@ describe('API', function()
       meths.buf_set_mark(buf, 'F', 2, 2, {})
       meths.buf_set_name(buf, "mybuf")
       local mark = meths.get_mark('F', {})
-      -- Compare the path tail ony
+      -- Compare the path tail only
       assert(string.find(mark[4], "mybuf$"))
       eq({2, 2, buf.id, mark[4]}, mark)
     end)
@@ -3124,6 +3128,24 @@ describe('API', function()
       eq('E539: Illegal character <}>',
          pcall_err(meths.eval_statusline, '%{%}', {}))
     end)
+    it('supports various items', function()
+      eq({ str = '0', width = 1 },
+         meths.eval_statusline('%l', { maxwidth = 5 }))
+      command('set readonly')
+      eq({ str = '[RO]', width = 4 },
+         meths.eval_statusline('%r', { maxwidth = 5 }))
+      local screen = Screen.new(80, 24)
+      screen:attach()
+      command('set showcmd')
+      feed('1234')
+      screen:expect({any = '1234'})
+      eq({ str = '1234', width = 4 },
+         meths.eval_statusline('%S', { maxwidth = 5 }))
+      feed('56')
+      screen:expect({any = '123456'})
+      eq({ str = '<3456', width = 5 },
+         meths.eval_statusline('%S', { maxwidth = 5 }))
+    end)
     describe('highlight parsing', function()
       it('works', function()
         eq({
@@ -3191,6 +3213,17 @@ describe('API', function()
             'TextWithNoHighlight%#WarningMsg#TextWithWarningHighlight',
             { use_winbar = true, highlights = true }))
       end)
+      it('no memory leak with click functions', function()
+        meths.eval_statusline('%@ClickFunc@StatusLineStringWithClickFunc%T', {})
+        eq({
+            str = 'StatusLineStringWithClickFunc',
+            width = 29
+          },
+          meths.eval_statusline(
+            '%@ClickFunc@StatusLineStringWithClickFunc%T',
+            {})
+          )
+      end)
     end)
   end)
   describe('nvim_parse_cmd', function()
@@ -3851,14 +3884,16 @@ describe('API', function()
       eq("", meths.cmd({ cmd = "Foo", bang = false }, { output = true }))
     end)
     it('works with modifiers', function()
-      -- with :silent output is still captured
+      -- with silent = true output is still captured
       eq('1',
          meths.cmd({ cmd = 'echomsg', args = { '1' }, mods = { silent = true } },
                    { output = true }))
       -- but message isn't added to message history
       eq('', meths.cmd({ cmd = 'messages' }, { output = true }))
+
       meths.create_user_command("Foo", 'set verbose', {})
       eq("  verbose=1", meths.cmd({ cmd = "Foo", mods = { verbose = 1 } }, { output = true }))
+
       meths.create_user_command("Mods", "echo '<mods>'", {})
       eq('keepmarks keeppatterns silent 3verbose aboveleft horizontal',
          meths.cmd({ cmd = "Mods", mods = {
@@ -3870,6 +3905,7 @@ describe('API', function()
            verbose = 3,
          } }, { output = true }))
       eq(0, meths.get_option_value("verbose", {}))
+
       command('edit foo.txt | edit bar.txt')
       eq('  1 #h   "foo.txt"                      line 1',
          meths.cmd({ cmd = "buffers", mods = { filter = { pattern = "foo", force = false } } },
@@ -3877,6 +3913,13 @@ describe('API', function()
       eq('  2 %a   "bar.txt"                      line 1',
          meths.cmd({ cmd = "buffers", mods = { filter = { pattern = "foo", force = true } } },
                    { output = true }))
+
+      -- with emsg_silent = true error is suppresed
+      feed([[:lua vim.api.nvim_cmd({ cmd = 'call', mods = { emsg_silent = true } }, {})<CR>]])
+      eq('', meths.cmd({ cmd = 'messages' }, { output = true }))
+      -- error from the next command typed is not suppressed #21420
+      feed(':call<CR><CR>')
+      eq('E471: Argument required', meths.cmd({ cmd = 'messages' }, { output = true }))
     end)
     it('works with magic.file', function()
       exec_lua([[
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index 7c65cf9c37..ecab6a4713 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -7,6 +7,7 @@ local clear, nvim, curbuf, curbuf_contents, window, curwin, eq, neq,
   helpers.tabpage
 local poke_eventloop = helpers.poke_eventloop
 local curwinmeths = helpers.curwinmeths
+local exec = helpers.exec
 local funcs = helpers.funcs
 local request = helpers.request
 local NIL = helpers.NIL
@@ -229,6 +230,46 @@ describe('API/win', function()
                                                                     |
       ]])
     end)
+
+    it('updates cursorcolumn in non-current window', function()
+      local screen = Screen.new(60, 8)
+      screen:set_default_attr_ids({
+        [1] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+        [2] = {background = Screen.colors.Grey90},  -- CursorColumn
+        [3] = {bold = true, reverse = true},  -- StatusLine
+        [4] = {reverse = true},  -- StatusLineNC
+      })
+      screen:attach()
+      command('set cursorcolumn')
+      insert([[
+        aaa
+        bbb
+        ccc
+        ddd]])
+      local oldwin = curwin()
+      command('vsplit')
+      screen:expect([[
+        aa{2:a}                           │aa{2:a}                          |
+        bb{2:b}                           │bb{2:b}                          |
+        cc{2:c}                           │cc{2:c}                          |
+        dd^d                           │ddd                          |
+        {1:~                             }│{1:~                            }|
+        {1:~                             }│{1:~                            }|
+        {3:[No Name] [+]                  }{4:[No Name] [+]                }|
+                                                                    |
+      ]])
+      window('set_cursor', oldwin, {2, 0})
+      screen:expect([[
+        aa{2:a}                           │{2:a}aa                          |
+        bb{2:b}                           │bbb                          |
+        cc{2:c}                           │{2:c}cc                          |
+        dd^d                           │{2:d}dd                          |
+        {1:~                             }│{1:~                            }|
+        {1:~                             }│{1:~                            }|
+        {3:[No Name] [+]                  }{4:[No Name] [+]                }|
+                                                                    |
+      ]])
+    end)
   end)
 
   describe('{get,set}_height', function()
@@ -243,6 +284,22 @@ describe('API/win', function()
       window('set_height', nvim('list_wins')[2], 2)
       eq(2, window('get_height', nvim('list_wins')[2]))
     end)
+
+    it('do not cause ml_get errors with foldmethod=expr #19989', function()
+      insert([[
+        aaaaa
+        bbbbb
+        ccccc]])
+      command('set foldmethod=expr')
+      exec([[
+        new
+        let w = nvim_get_current_win()
+        wincmd w
+        call nvim_win_set_height(w, 5)
+      ]])
+      feed('l')
+      eq('', meths.get_vvar('errmsg'))
+    end)
   end)
 
   describe('{get,set}_width', function()
@@ -257,6 +314,22 @@ describe('API/win', function()
       window('set_width', nvim('list_wins')[2], 2)
       eq(2, window('get_width', nvim('list_wins')[2]))
     end)
+
+    it('do not cause ml_get errors with foldmethod=expr #19989', function()
+      insert([[
+        aaaaa
+        bbbbb
+        ccccc]])
+      command('set foldmethod=expr')
+      exec([[
+        vnew
+        let w = nvim_get_current_win()
+        wincmd w
+        call nvim_win_set_width(w, 5)
+      ]])
+      feed('l')
+      eq('', meths.get_vvar('errmsg'))
+    end)
   end)
 
   describe('{get,set,del}_var', function()
@@ -450,6 +523,8 @@ describe('API/win', function()
 
     it('closing current (float) window of another tabpage #15313', function()
       command('tabedit')
+      command('botright split')
+      local prevwin = curwin().id
       eq(2, eval('tabpagenr()'))
       local win = meths.open_win(0, true, {
         relative='editor', row=10, col=10, width=50, height=10
@@ -459,7 +534,7 @@ describe('API/win', function()
       eq(1, eval('tabpagenr()'))
       meths.win_close(win, false)
 
-      eq(1001, meths.tabpage_get_win(tab).id)
+      eq(prevwin, meths.tabpage_get_win(tab).id)
       assert_alive()
     end)
   end)