From aaee64e00882d1ea2a290636c196b14678f11237 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 14 Sep 2026 02:27:53 -0400 Subject: build(vim-patch): fix xfuncname for runtime/doc/, detect n/a patches for Vimscript syntax #41898 * build(vim-patch): fix vimhelp xfuncname cfa8f9a3f285060152ebbdbf86fbc7aecf1dd756 has changes near: > - If the BufRead* events allow you to edit a compressed file, the FileRead* Update git-diff "xfuncname" to skip the above line when searching for nearest "hunk header". * build(vim-patch): f27e80a6e183a617dd885311871fd4eaa6075d16 is n/a Nvim generates "runtime/syntax/vim/generated.vim" based on "src/nvim/*.lua", specifically "src/nvim/ex_cmds.lua" for Ex commands, since https://github.com/neovim/neovim/pull/2288 . * build(vim-patch): ee865249b1edd56e297f12025e11defb6a4bf445 is n/a * build(vim-patch): a44ced5763d377c71c96562b894c1c026ba89328 is n/a --- scripts/vim-patch.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 41721fa58f..69c054cd57 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -939,7 +939,7 @@ is_na_patch() { for file in $FILES_REMAINING; do case ${file} in runtime/doc/*.txt | runtime/pack/dist/opt/*/doc/*.txt) - HUNKS=$(git -c core.attributesfile="$NVIM_SOURCE_DIR"/.gitattributes -c 'diff.helphelp.xfuncname=^.*\*[^*]+\*$' -C "${VIM_SOURCE_DIR}" \ + HUNKS=$(git -c core.attributesfile="$NVIM_SOURCE_DIR"/.gitattributes -c 'diff.helphelp.xfuncname=^.*\*[^*\s]+\*$' -C "${VIM_SOURCE_DIR}" \ diff-tree --no-commit-id -r -b -U0 \ '-I^\s+$' \ '-I^=+$' \ @@ -965,8 +965,11 @@ is_na_patch() { ;; runtime/syntax/vim.vim) HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ + '-I^\s+$' \ '-I^" Last Change:\s' \ - '-I^syn\skeyword\svimFuncName\scontained\s' \ + '-I^\s*syn\s+keyword\s+(vimCommand|vimFuncName)\s+contained\s+' \ + '-I^\s*syn\s+keyword\s+vimAutoEvent\s+contained\s+[^U]' \ + '-I^\s*syn\s+match\s+vimFuncName\s+contained\s+"\\