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

5 files changed, 29 insertions, 14 deletions

diff --git a/test/functional/ex_cmds/append_spec.lua b/test/functional/ex_cmds/append_spec.lua
index 80fdcb3134..df62aecc7f 100644
--- a/test/functional/ex_cmds/append_spec.lua
+++ b/test/functional/ex_cmds/append_spec.lua
@@ -23,7 +23,7 @@ local cmdtest = function(cmd, prep, ret1)
     end
 
     it(cmd .. 's' .. prep .. ' the current line by default', function()
-      command(cmd .. '\nabc\ndef\n')
+      command(cmd .. '\nabc\ndef')
       eq(ret1, buffer_contents())
     end)
     -- Used to crash because this invokes history processing which uses
diff --git a/test/functional/ex_cmds/excmd_spec.lua b/test/functional/ex_cmds/excmd_spec.lua
index 20ebb2dedb..923bb99eeb 100644
--- a/test/functional/ex_cmds/excmd_spec.lua
+++ b/test/functional/ex_cmds/excmd_spec.lua
@@ -29,13 +29,13 @@ describe('Ex cmds', function()
       ':tabnext 9999999999999999999999999999999999999999',
       'Vim(tabnext):E475: Invalid argument: 9999999999999999999999999999999999999999'
     )
-    check_excmd_err(
-      ':N 9999999999999999999999999999999999999999',
-      'Vim(Next):E939: Positive count required'
+    eq(
+      'Vim(Next):E163: There is only one file to edit',
+      pcall_err(command, ':N 9999999999999999999999999999999999999999')
     )
     check_excmd_err(
       ':bdelete 9999999999999999999999999999999999999999',
-      'Vim(bdelete):E939: Positive count required'
+      'Vim(bdelete):E516: No buffers were deleted'
     )
     eq(
       'Vim(menu):E329: No menu "9999999999999999999999999999999999999999"',
diff --git a/test/functional/ex_cmds/mksession_spec.lua b/test/functional/ex_cmds/mksession_spec.lua
index 9b24854362..8f09e802eb 100644
--- a/test/functional/ex_cmds/mksession_spec.lua
+++ b/test/functional/ex_cmds/mksession_spec.lua
@@ -170,7 +170,7 @@ describe(':mksession', function()
     skip(is_os('win'), 'causes rmdir() to fail')
 
     local cwd_dir = fn.fnamemodify('.', ':p:~'):gsub([[[\/]*$]], '')
-    cwd_dir = cwd_dir:gsub([[\]], '/') -- :mksession always uses unix slashes.
+    cwd_dir = t.fix_slashes(cwd_dir) -- :mksession always uses unix slashes.
     local session_path = cwd_dir .. '/' .. session_file
 
     command('cd ' .. tab_dir)
diff --git a/test/functional/ex_cmds/profile_spec.lua b/test/functional/ex_cmds/profile_spec.lua
index 57e5c6b2dc..365583948b 100644
--- a/test/functional/ex_cmds/profile_spec.lua
+++ b/test/functional/ex_cmds/profile_spec.lua
@@ -6,17 +6,11 @@ require('os')
 local eval = n.eval
 local command = n.command
 local eq, neq = t.eq, t.neq
-local tempfile = t.tmpname()
+local tempfile = t.tmpname(false)
 local source = n.source
 local matches = t.matches
 local read_file = t.read_file
 
--- tmpname() also creates the file on POSIX systems. Remove it again.
--- We just need the name, ignoring any race conditions.
-if uv.fs_stat(tempfile).uid then
-  os.remove(tempfile)
-end
-
 local function assert_file_exists(filepath)
   neq(nil, uv.fs_stat(filepath).uid)
 end
@@ -31,6 +25,7 @@ describe(':profile', function()
   after_each(function()
     n.expect_exit(command, 'qall!')
     if uv.fs_stat(tempfile).uid ~= nil then
+      -- Delete the tempfile. We just need the name, ignoring any race conditions.
       os.remove(tempfile)
     end
   end)
diff --git a/test/functional/ex_cmds/quickfix_commands_spec.lua b/test/functional/ex_cmds/quickfix_commands_spec.lua
index 3df41b015e..9c47b1f05f 100644
--- a/test/functional/ex_cmds/quickfix_commands_spec.lua
+++ b/test/functional/ex_cmds/quickfix_commands_spec.lua
@@ -185,6 +185,9 @@ describe('quickfix', function()
   it('BufAdd does not cause E16 when reusing quickfix buffer #18135', function()
     local file = file_base .. '_reuse_qfbuf_BufAdd'
     write_file(file, ('\n'):rep(100) .. 'foo')
+    finally(function()
+      os.remove(file)
+    end)
     source([[
       set grepprg=internal
       autocmd BufAdd * call and(0, 0)
@@ -192,7 +195,24 @@ describe('quickfix', function()
     ]])
     command('grep foo ' .. file)
     command('grep foo ' .. file)
-    os.remove(file)
+  end)
+
+  it('jump message does not scroll with cmdheight=0 and shm+=O #29597', function()
+    local screen = Screen.new(40, 6)
+    screen:attach()
+    command('set cmdheight=0')
+    local file = file_base .. '_reuse_qfbuf_BufAdd'
+    write_file(file, 'foobar')
+    finally(function()
+      os.remove(file)
+    end)
+    command('vimgrep /foo/gj ' .. file)
+    feed(':cc<CR>')
+    screen:expect([[
+      ^foobar                                  |
+      {1:~                                       }|*4
+      (1 of 1): foobar                        |
+    ]])
   end)
 end)