From 693de029bc0377dc89291ab3dedeec1f01051a73 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 6 Aug 2026 12:53:45 -0400 Subject: [PATCH 1/4] build(vim-patch): vim9 skip_type() is n/a v8.2.1300 --- scripts/vim-patch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index fe4c99b1da..74966c99e8 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -982,6 +982,7 @@ is_na_patch() { '-I#\s*define.*ex_ni$' \ '-I[_.>]sc_version = ' \ '-I[_.>]uf_script_ctx_version = ' \ + '-I = skip_type\(.+\);$' \ "$patch" -- "${file}" | grep '^@@ .* @@') if test -n "$HUNKS"; then From 12d9f33c155dcd06c3920defa72db081db4c5774 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 6 Aug 2026 13:16:35 -0400 Subject: [PATCH 2/4] build(vim-patch): vim9 error 1103 is n/a v8.2.1341 --- scripts/vim-patch.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 74966c99e8..fb5b5a6268 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -960,11 +960,14 @@ is_na_patch() { '-I^EXTERN char e_.*enddef' \ '-I^EXTERN char e_.*vim9' \ '-I^EXTERN char e_cannot_declare_.*variable_str' \ + '-I^EXTERN char e_dictionary_not_set' \ + '-I^EXTERN char e_dictnull' \ '-I\sINIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \ '-I\sINIT\(= .+"E[0-9]+: .*:def ' \ '-I\sINIT\(= .+"E[0-9]+: .*enddef"' \ '-I\sINIT\(= .+"E[0-9]+: .*[vV]im9' \ '-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \ + '-I\s+INIT\(= .+"E1103: Dictionary not set' \ "$patch" -- "${file}" | grep '^@@ .* @@') if test -n "$HUNKS"; then From 2b7c53be421b6d733a161bb5b11cfa54090db519 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 6 Aug 2026 19:33:43 -0400 Subject: [PATCH 3/4] build(vim-patch): runnvim should make redir_test_to_null n/a Prior patches for it are marked n/a. Target v8.2.2630 . --- scripts/vim-patch.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index fb5b5a6268..472c4c6c58 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -942,6 +942,12 @@ is_na_patch() { test "$HUNK_NUM_FINAL" -ne 0 && return 1 fi ;; + src/testdir/Makefile) + HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ + '-IREDIR_TEST_TO_NULL = ' \ + "$patch" -- "${file}") + test -n "$HUNKS" && return 1 + ;; src/testdir/Make*.mak) HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ '-I\stest8[67]\.out \\$' \ From 107b806bbe6461f76f5167f1cf5c56def705bdd7 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 6 Aug 2026 23:15:57 -0400 Subject: [PATCH 4/4] build(vim-patch): os makefile for tests are n/a Following remain relevant: - src/testdir/Makefile (default setup in Unix-like OS) - src/testdir/Make_all.mak (define old/new style Vim tests) Rest are n/a because Nvim runs Vim's tests on GHA Windows runner. --- scripts/vim-patch.sh | 2 +- scripts/vim_na_files.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 472c4c6c58..2b419f627e 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -948,7 +948,7 @@ is_na_patch() { "$patch" -- "${file}") test -n "$HUNKS" && return 1 ;; - src/testdir/Make*.mak) + src/testdir/Make_all.mak) HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ '-I\stest8[67]\.out \\$' \ "$patch" -- "${file}") diff --git a/scripts/vim_na_files.txt b/scripts/vim_na_files.txt index bacb78ab51..566b85339f 100644 --- a/scripts/vim_na_files.txt +++ b/scripts/vim_na_files.txt @@ -98,6 +98,8 @@ src/terminal.c src/termlib.c src/testdir/Make_amiga.mak src/testdir/Make_dos.mak +src/testdir/Make_ming.mak +src/testdir/Make_mvc.mak src/testdir/crash/heap_overflow3 src/testdir/lsan-suppress.txt src/testdir/samples/terminal_max_combining_chars.txt