Merge pull request #26358 from zeertzjq/vim-9.0.2140

vim-patch:9.0.{2140,2141,2142,2143}

2 files changed, 18 insertions, 6 deletions

diff --git a/test/functional/legacy/crash_spec.lua b/test/functional/legacy/crash_spec.lua
index 5094f81847..094bea253e 100644
--- a/test/functional/legacy/crash_spec.lua
+++ b/test/functional/legacy/crash_spec.lua
@@ -6,7 +6,6 @@ local feed = helpers.feed
 
 before_each(clear)
 
--- oldtest: Test_crash1()
 it('no crash when ending Visual mode while editing buffer closes window', function()
   command('new')
   command('autocmd ModeChanged v:n ++once close')
@@ -14,3 +13,21 @@ it('no crash when ending Visual mode while editing buffer closes window', functi
   command('enew')
   assert_alive()
 end)
+
+it('no crash when ending Visual mode close the window to switch to', function()
+  command('new')
+  command('autocmd ModeChanged v:n ++once only')
+  feed('v')
+  command('wincmd p')
+  assert_alive()
+end)
+
+it('no crash when truncating overlong message', function()
+  pcall(command, 'source test/old/testdir/crash/vim_msg_trunc_poc')
+  assert_alive()
+end)
+
+it('no crash with very long option error message', function()
+  pcall(command, 'source test/old/testdir/crash/poc_did_set_langmap')
+  assert_alive()
+end)
diff --git a/test/functional/legacy/messages_spec.lua b/test/functional/legacy/messages_spec.lua
index e0cc1dc79c..146b00acb0 100644
--- a/test/functional/legacy/messages_spec.lua
+++ b/test/functional/legacy/messages_spec.lua
@@ -801,9 +801,4 @@ describe('messages', function()
     ]])
     os.remove('b.txt')
   end)
-
-  it('no crash when truncating overlong message', function()
-    pcall(command, 'source test/old/testdir/crash/vim_msg_trunc_poc')
-    assert_alive()
-  end)
 end)