From c2d7f6b642cf59966ad2337d3def7580b9c73de6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 6 Apr 2026 16:27:11 +0800
Subject: [PATCH 1/2] vim-patch:9.2.0303: tests: zip plugin tests don't check
 for warning message properly

Problem:  zip plugin tests may match messages from previous test cases
          when checking for warning message.
Solution: Clear messages at the start of these tests (zeertzjq).

closes: vim/vim#19926

https://github.com/vim/vim/commit/a1f4259e68235e4c8e154842a392d83f3301d2f3
---
 test/old/testdir/test_plugin_zip.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/old/testdir/test_plugin_zip.vim b/test/old/testdir/test_plugin_zip.vim
index ab26230cc8..04c5d0d32c 100644
--- a/test/old/testdir/test_plugin_zip.vim
+++ b/test/old/testdir/test_plugin_zip.vim
@@ -258,6 +258,7 @@ func Test_zip_fname_evil_path()
   " needed for writing the zip file
   CheckExecutable zip
 
+  messages clear
   call s:CopyZipFile("evil.zip")
   defer delete("X.zip")
   e X.zip
@@ -281,6 +282,7 @@ func Test_zip_fname_evil_path2()
   " needed for writing the zip file
   CheckExecutable zip
 
+  messages clear
   call s:CopyZipFile("evil.zip")
   defer delete("X.zip")
   e X.zip
@@ -303,6 +305,7 @@ func Test_zip_fname_evil_path3()
   " needed for writing the zip file
   CheckExecutable zip
 
+  messages clear
   call s:CopyZipFile("evil.zip")
   defer delete("X.zip")
   e X.zip

From f8695fc529e6199b6598ace7207fe0ad342e00e4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 6 Apr 2026 16:27:52 +0800
Subject: [PATCH 2/2] vim-patch:9.2.0304: tests: test for 9.2.0285 doesn't
 always fail without the fix

Problem:  When the terminal is very large, test for 9.2.0285 doesn't
          trigger an ASAN error without the fix.
Solution: Use a window with fixed height (zeertzjq)

closes: vim/vim#19924

https://github.com/vim/vim/commit/b03970f41f17ce8f27b1c453784763527360d81b
---
 test/old/testdir/test_syntax.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/old/testdir/test_syntax.vim b/test/old/testdir/test_syntax.vim
index 36d7dc61c3..5046f56c68 100644
--- a/test/old/testdir/test_syntax.vim
+++ b/test/old/testdir/test_syntax.vim
@@ -994,9 +994,9 @@ func Test_syn_sync_grouphere_shorter_next_line()
       bar
     fi
   END
-  let lines = ['a']->repeat(50) + lines + ['a']->repeat(28 + winheight(0))
+  let lines = ['a']->repeat(50) + lines + ['a']->repeat(48)
 
-  new
+  20new
   call setline(1, lines)
   syn region shIf transparent
         \ start="\<if\_s" skip=+-fi\>+ end="\<;\_s*then\>" end="\<fi\>"