aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJan Edmund Lazo <janedmundlazo@hotmail.com>2026-08-03 05:33:32 -0400
committerGitHub <noreply@github.com>2026-08-03 05:33:32 -0400
commit0aed30b4de042dce9941f789b6df1035b0fa73c8 (patch)
treeaa5d6f4a3d30faf5f36c7d67947d721df82fdc5d /scripts
parent9ff302d0ca260ffb06b1f1815ac4db1c63d1a9b3 (diff)
downloadrneovim-0aed30b4de042dce9941f789b6df1035b0fa73c8.tar.gz
rneovim-0aed30b4de042dce9941f789b6df1035b0fa73c8.tar.bz2
rneovim-0aed30b4de042dce9941f789b6df1035b0fa73c8.zip
build(vim-patch): misc n/a funcs, headers, err msgs #41116
* build(vim-patch): n/a func in version.c init_longVersion() sets datetime for ":version". Nvim removed it for more deterministic builds. * build(vim-patch): n/a header from amiga * build(vim-patch): n/a vim9 err msg for declaring vars * build(vim-patch): nvim support.txt replaces *os-support* * build(vim-patch): vim xdg is n/a * build(vim-patch): n/a 1-line err msg Vim error message can be 1-line (globals.h), not multi-line (errors.h). Target v8.2.1032
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vim-patch.sh12
-rw-r--r--scripts/vim_na_hunks_c.txt1
-rw-r--r--scripts/vim_na_hunks_vim.txt1
3 files changed, 10 insertions, 4 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 7f5d7f8628..3a4b39ce2e 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -947,15 +947,18 @@ is_na_patch() {
'-I^\s+$' \
'-I^#\s*(ifdef|if.*defined\().*FEAT_' \
'-I^#\s*(else|endif)' \
+ '-I#\s*define\s+XDG_' \
'-I^EXTERN type_T t_.* INIT[2-9]\(' \
'-I^EXTERN char e_(abstract|class|enum|interface|type)_' \
'-I^EXTERN char e_.*def_function' \
'-I^EXTERN char e_.*enddef' \
'-I^EXTERN char e_.*vim9' \
- '-I^\s*INIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \
- '-I^\s*INIT\(= .+"E[0-9]+: .*:def ' \
- '-I^\s*INIT\(= .+"E[0-9]+: .*enddef"' \
- '-I^\s*INIT\(= .+"E[0-9]+: .*[vV]im9' \
+ '-I^EXTERN char e_cannot_declare_.*variable_str' \
+ '-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: ' \
"$patch" -- "${file}" |
grep '^@@ .* @@')
if test -n "$HUNKS"; then
@@ -966,6 +969,7 @@ 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*(else|endif)' \
'-I^\s+\{"prop_[a-z]+",.*f_prop_[a-z]+},$' \
diff --git a/scripts/vim_na_hunks_c.txt b/scripts/vim_na_hunks_c.txt
index 9cea517cf5..1ff04b3d6b 100644
--- a/scripts/vim_na_hunks_c.txt
+++ b/scripts/vim_na_hunks_c.txt
@@ -42,6 +42,7 @@
^f_test_settime(
^f_test_srand_seed(
^f_test_void(
+^init_longVersion(
^l\?alloc(size_t
^l\?alloc[a-zA-Z0-9_]\+(size_t
^mch_job_[a-z]\+(
diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt
index b7177fd02a..b8243097d8 100644
--- a/scripts/vim_na_hunks_vim.txt
+++ b/scripts/vim_na_hunks_vim.txt
@@ -96,6 +96,7 @@
\*builtin-function-list\*
\*emacs[_-]tags\*
\*help-toc-install\*
+\*os-support\*
\*patches-\(after-\)\?[0-9].*\*
\*test_gui_[a-zA-Z0-9_]\+()\*
\*v:none\*