Merge pull request #38820 from zeertzjq/vim-9.2.0303

vim-patch:9.2.{0303,0304}
This commit is contained in:
zeertzjq
2026-04-06 16:52:06 +08:00
committed by GitHub
2 changed files with 5 additions and 2 deletions

View File

@@ -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

View File

@@ -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\>"