diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2026-10-13 05:09:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-13 05:09:27 -0400 |
| commit | fc51aea475b8687e4f5eff2cf22fef0c72fa62b4 (patch) | |
| tree | 4acd57b25a62ac75cc344a09a019d30e5d0ab9fe /scripts/vim-patch.sh | |
| parent | f84f8a4155713689f5ebdf297b7c9d4db81d18b1 (diff) | |
| download | rneovim-fc51aea475b8687e4f5eff2cf22fef0c72fa62b4.tar.gz rneovim-fc51aea475b8687e4f5eff2cf22fef0c72fa62b4.tar.bz2 rneovim-fc51aea475b8687e4f5eff2cf22fef0c72fa62b4.zip | |
build(vim-patch): n/a patches since v9.1.0500 #42320
* build(vim-patch): v9.1.0500 is n/a
* build(vim-patch): n/a change in src/po/Make*
Nvim uses "TARGET_FILE:nvim_bin" in CMake.
* build(vim-patch): runtime/doc/pi_netrw.txt should be n/a
Minor differences between netrw docs are not relevant to Neovim.
Vim keeps pi_netrw.txt to add/override few lines
but it is partly "behind" upstream netrw.
- runtime/doc/pi_netrw.txt
- runtime/pack/dist/opt/netrw/doc/netrw.txt
* build(vim-patch): track ':Tutor' patches
":Tutor" remains maintained based on recent Github issues
such that Neovim does not rely on Vim patches to fix its own
implementation.
Develepor may port Vim patches that fix Vim's implementation of ":Tutor"
but Vim and Neovim remain incompatible
after Neovim replace metadata JSON files with inline comments,
https://github.com/neovim/neovim/issues/38527 .
Vim and Neovim are not obligated to restrict their tutor files
in order to ensure 100% (backward) compatibility on both editors.
Both will use their exclusive and incompatible features to enhance
the user experience in ":Tutor".
Continue to track ":Tutor" patches to not discourage
contributors on both projects.
Target 6fa304f27d630f4c11c903a61d434f739230e8e1 .
* build(vim-patch): n/a tabpanel changes from v9.1.1391
Diffstat (limited to 'scripts/vim-patch.sh')
| -rwxr-xr-x | scripts/vim-patch.sh | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 58077b1449..6d3d8793f2 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -875,6 +875,7 @@ is_na_patch() { '-I^(Functions:|GUI|Other)\s~$' \ '-I^[A-Z]\s+\*\+sodium\*\s+compiled with ' \ '-I^\|(ch|popup)_[_a-z]+\(\)\|' \ + '-I^'\''tabpanel[a-z]*'\' \ '-I^popup_[_a-z]+\(' \ '-I^sodium\s+Compiled with ' \ '-I\*\s+For Vim version [0-9]\.[0-9]\.\s+Last change: [0-9]+ [A-Z][a-z]+ [0-9]+' \ @@ -892,6 +893,8 @@ is_na_patch() { '-I\sGTK\s?4\s' \ '-I\spopup window\s' \ '-I\sterm_start\(\)\s' \ + '-I\svim\s.*VIMRUNTIME/tutor/tutor' \ + '-I[[:space:],]tpl_vert[[:space:]:]' \ '-I\-gui=gtk' \ "$patch" -- "${file}") if test -n "$HUNKS"; then @@ -912,6 +915,7 @@ is_na_patch() { src/po/Make*) HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ '-I^\$\([_A-Z]+\)\.pot:' \ + '-I^VIM(PROG)?\s=\s' \ "$patch" -- "${file}") if test -n "$HUNKS"; then # shellcheck disable=SC2016 @@ -946,18 +950,20 @@ is_na_patch() { HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ '-I^\s+$' \ '-I^\s*/?\*/?$' \ - '-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{,4} unused|E[0-9]{4} - |FEAT_|JSON-RPC|channel|job|popup|sound|terminal)' \ + '-I^\s*(//|/?\*).*\s\+?([vV]im9|E[0-9]{,4} unused|E[0-9]{4} - |FEAT_|JSON-RPC|channel|job|popup|sound|tabpanel|terminal)' \ '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*(FEAT_[^_]|USE_GTK)' \ '-I^#\s*(else|endif)' \ '-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \ '-I^\s+(&&|\|\|)\s.*defined\(.*FEAT_[^_]' \ '-IEVENT_TERMINALWINOPEN' \ - '-I^#\s*define\s+(ASSIGN_VAR|POPF_CURSORLINE)\s' \ + '-I^#\s*define\s+(ASSIGN_VAR|IN_TABPANEL|POPF_CURSORLINE)\s' \ '-I^typedef enum \{$' \ '-I^\s+(CH_MODE|POPCLOSE)_[A-Z]+,?(\s+//.+)?$' \ '-I^\} popclose_T;$' \ '-I^EXTERN\schar\s+\*popup_transparent' \ + '-I^EXTERN\schar_u\s+\*p_tplo?;' \ '-I^EXTERN\sint\s+[_a-z]+_for_testing\s' \ + '-I^EXTERN\slong\s+p_stpl;' \ '-I^EXTERN type_T static_types\[' \ '-I^EXTERN type_T t_.* INIT[2-9]\(' \ '-I^EXTERN\swin_T\s+\*popup_dragwin' \ @@ -965,7 +971,7 @@ is_na_patch() { '-I^EXTERN char e_.*def_function' \ '-I^EXTERN char e_.*enddef' \ '-I^EXTERN char e_.*vim9' \ - '-I^EXTERN char e_[_a-z]+_channel' \ + '-I^EXTERN char e_[_a-zA-Z]+_(channel|redrawtabpanel)' \ '-I^EXTERN char e_cannot_add(_redraw|)_listener_in_listener_callback' \ '-I^EXTERN char e_cannot_declare_.*variable_str' \ '-I^EXTERN char e_cannot_define_new_.+_as_static' \ @@ -977,6 +983,7 @@ is_na_patch() { '-I^EXTERN char e_failed_to_source_defaults' \ '-I^EXTERN char e_gethostbyname_in_channel_' \ '-I^EXTERN char e_invalid_identifier_in_defineannotype' \ + '-I^EXTERN int\s+redraw_tabpanel\s' \ '-I\sINIT\(= .+"E[0-9]+: (Abstract|Const|Class|Enum|Final|Interface|Public|Static|Type) ' \ '-I\sINIT\(= .+"E[0-9]+: .*:def ' \ '-I\sINIT\(= .+"E[0-9]+: .*enddef"' \ @@ -989,12 +996,15 @@ is_na_patch() { '-I\sINIT\(= .+"E1365: Cannot use a return type with the \\"new\\" function"' \ '-I\sINIT\(= .+"E1370: Cannot define a .+ as static' \ '-I\sINIT\(= .+"E15[0-9]+: Cannot use .*listener_add in a .* listener callback"' \ + '-I\sINIT\(= .+"E1547: .+ :redrawtabpanel"' \ '-I\sINIT\(= .+"E1551: Cannot open a popup window to a closing buffer' \ '-I\sINIT\(= .+"E157[34]: ' \ + '-I\sHLF_TPL[SF]?\s+//\stabpanel' \ '-I\s(bool|char(|_u)|int)\s+w_popup_image_[_a-zA-Z]+;' \ '-I\schar(|_u)\s+\*w_popup_title;' \ '-I\sint\s+ch_[_a-zA-Z]+;' \ '-I\sint\s+sv_const;' \ + '-I\sint\s+tpl_vert;' \ '-I\sint\s+w_(filter_mode|firstline|popup_drag|want_scrollbar);' \ '-I\slist_T\s+\*w_popup_mask;' \ '-I\spopclose_T\sw_popup_close;' \ @@ -1009,18 +1019,20 @@ is_na_patch() { HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ '-I^\s+$' \ '-I^\s*/?\*/?$' \ - '-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|terminal|uf_type_list)' \ + '-I^\s*(//|/?\*).*\s\+?([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|tabpanel|terminal|uf_type_list)' \ '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*(FEAT_[^_]|USE_GTK)' \ '-I^#\s*(else|endif)' \ '-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \ '-I^\s+(&&|\|\|)\s.*defined\(.*FEAT_[^_]' \ '-IEVENT_TERMINALWINOPEN' \ '-I^#\s*include\s+<proto/' \ - '-I^\s+\{"ch_[_a-z]+",.*\sFEARG_[1-9],\s+arg[1-9]+_' \ + '-I^\s+\{"(ch|popup)_[_a-z]+",.*\sFEARG_[1-9],\s+arg[1-9]_[_a-z]+' \ '-I^\s+\{"(popup|prop|sound)_[_a-z]+",.*f_(popup|prop|sound)_[_a-z]+\)?},$' \ - '-I^\s+ret_[a-z]+,\s+(JOB|PROP)_FUNC\(f_.+\)},$' \ + '-I^\s+ret_[_a-z]+,\s+(JOB|PROP)_FUNC\(f_.+\)},$' \ '-I^\s*(static)?\s(char(|_u)|hashtab_T|int|void)( \*)?$' \ + '-I^static\sargcheck_T\sarg[1-9]_[_a-z]+' \ '-I^static\s(char(|_u)|hashtab_T|int|void)\s\*?[^*]+\(.+\);$' \ + '-I^static\schar\s\*\(p_tpl_values' \ '-I#\s*define.*ex_ni$' \ '-I[.>]b_p_key' \ '-I[_.>]sc_version = ' \ @@ -1031,8 +1043,11 @@ is_na_patch() { '-Icrypt_get_method_nr\(.+\)' \ '-Ie_failed_to_source_defaults' \ '-Imsg\(.*".*GTK.*"\)' \ + '-I\s"default link TabPanel.+",' \ + '-I\sif\s\((in|redraw)_tabpanel[[:space:])]' \ + '-I\s(in|redraw)_tabpanel =' \ + '-I\sdraw_tabpanel\(\);$' \ '-I\spopup_set_firstline\(.+\);' \ - '-I\sredraw_tabpanel =' \ '-I\sterm_focus_change\(.+\);$' \ '-I\supdate_vim9_script_var\(.+\);$' \ '-I\svim_free\(.*w_popup_title\);' \ |