mirror of
https://github.com/neovim/neovim.git
synced 2026-08-17 12:52:52 +00:00
build(vim-patch): n/a patches from comments, ifdefs #41247
vim-patch.sh fails to detect n/a patches because of ifdef FEAT_ guards and reserved Vim9script error codes. Ignore all conditional directives for Vim's "FEAT_" guards. https://cppreference.com/c/preprocessor/conditional
This commit is contained in:
@@ -957,7 +957,9 @@ is_na_patch() {
|
||||
*.h)
|
||||
HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
|
||||
'-I^\s+$' \
|
||||
'-I^#\s*(ifdef|if.*defined\().*FEAT_' \
|
||||
'-I^\s*/?\*/?$' \
|
||||
'-I^\s*(//|/?\*).*\s[vV]im9' \
|
||||
'-I^#\s*((ifdef|ifndef|define|undef)|(if|elif)\s.*defined\().*FEAT_' \
|
||||
'-I^#\s*(else|endif)' \
|
||||
'-I#\s*define\s+XDG_' \
|
||||
'-I^EXTERN type_T t_.* INIT[2-9]\(' \
|
||||
@@ -984,9 +986,11 @@ is_na_patch() {
|
||||
*.c)
|
||||
HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
|
||||
'-I^\s+$' \
|
||||
'-I^#\s*include\s+<proto/' \
|
||||
'-I^#\s*(ifdef|if.*defined\().*FEAT_' \
|
||||
'-I^\s*/?\*/?$' \
|
||||
'-I^\s*(//|/?\*).*\s[vV]im9' \
|
||||
'-I^#\s*((ifdef|ifndef|define|undef)\s|(if|elif)\s.*defined\().*FEAT_' \
|
||||
'-I^#\s*(else|endif)' \
|
||||
'-I^#\s*include\s+<proto/' \
|
||||
'-I^\s+\{"prop_[a-z]+",.*f_prop_[a-z]+},$' \
|
||||
'-I#\s*define.*ex_ni$' \
|
||||
'-I[_.>]sc_version = ' \
|
||||
|
||||
Reference in New Issue
Block a user