diff --git a/vim-fugitive-Remove-unnecessary-complete-on-command-with-no-argum.patch b/vim-fugitive-Remove-unnecessary-complete-on-command-with-no-argum.patch new file mode 100644 index 0000000..f6a2aa3 --- /dev/null +++ b/vim-fugitive-Remove-unnecessary-complete-on-command-with-no-argum.patch @@ -0,0 +1,43 @@ +From: Tim Pope +Date: Sun, 11 Jul 2021 11:33:31 -0400 +Subject: Remove unnecessary -complete on command with no arguments +Git-repo: https://github.com/tpope/vim-fugitive.git +Git-commit: 4cdeff8c33ec2fe0686324bf1846ce158c452754 +Patch-mainline: 3.4 +References: vim-fugitive error + +References https://github.com/vim/vim/pull/8544 + +Signed-off-by: Jiri Slaby +--- + plugin/fugitive.vim | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim +index bab337a9..62ae17f1 100644 +--- a/plugin/fugitive.vim ++++ b/plugin/fugitive.vim +@@ -438,16 +438,16 @@ exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw + exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(, , +"", 0, "", , [])' + exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq exe fugitive#WqCommand( , , +"", 0, "", , [])' + +-exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject GRemove exe fugitive#RemoveCommand(, , +"", 0, "", , [])' +-exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject GDelete exe fugitive#DeleteCommand(, , +"", 0, "", , [])' ++exe 'command! -bar -bang -nargs=0 GRemove exe fugitive#RemoveCommand(, , +"", 0, "", , [])' ++exe 'command! -bar -bang -nargs=0 GDelete exe fugitive#DeleteCommand(, , +"", 0, "", , [])' + exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject GMove exe fugitive#MoveCommand( , , +"", 0, "", , [])' + exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete GRename exe fugitive#RenameCommand(, , +"", 0, "", , [])' + if exists(':Gremove') != 2 && get(g:, 'fugitive_legacy_commands', 1) +- exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gremove exe fugitive#RemoveCommand(, , +"", 0, "", , [])' ++ exe 'command! -bar -bang -nargs=0 Gremove exe fugitive#RemoveCommand(, , +"", 0, "", , [])' + \ '|echohl WarningMSG|echo ":Gremove is deprecated in favor of :GRemove"|echohl NONE' + endif + if exists(':Gdelete') != 2 && get(g:, 'fugitive_legacy_commands', 1) +- exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gdelete exe fugitive#DeleteCommand(, , +"", 0, "", , [])' ++ exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(, , +"", 0, "", , [])' + \ '|echohl WarningMSG|echo ":Gdelete is deprecated in favor of :GDelete"|echohl NONE' + endif + if exists(':Gmove') != 2 && get(g:, 'fugitive_legacy_commands', 1) +-- +2.26.2 + diff --git a/vim-plugins.changes b/vim-plugins.changes index 75903ff..8a7d391 100644 --- a/vim-plugins.changes +++ b/vim-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 3 11:22:05 UTC 2021 - Jiri Slaby + +- update vim-fugitive to 3.3 +- add vim-fugitive-Remove-unnecessary-complete-on-command-with-no-argum.patch + ------------------------------------------------------------------- Mon Apr 26 07:09:59 UTC 2021 - Jiri Slaby diff --git a/vim-plugins.spec b/vim-plugins.spec index fa354f7..7c02f8d 100644 --- a/vim-plugins.spec +++ b/vim-plugins.spec @@ -26,7 +26,7 @@ %define diffchanges_version 0.6.346dae2 %define editorconfig_version 0.3.3 %define file_line_version 1.0+20161020 -%define fugitive_version 3.2 +%define fugitive_version 3.3 %define gitdiff_version 2 %define gnupg_version 2.7.1 %define latex_version 1.10.0+20210323 @@ -104,6 +104,7 @@ Source1000: https://raw.githubusercontent.com/openSUSE/pack-tools/master/con Patch1: locateopen-1.3-locate-support.patch Patch2: showmarks-signs.patch Patch3: file-line-Fix-other-plugins-loading.patch +Patch4: vim-fugitive-Remove-unnecessary-complete-on-command-with-no-argum.patch BuildRequires: vim BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -641,6 +642,9 @@ popd pushd file-line-%file_line_version %patch3 -p1 popd +pushd vim-fugitive-%fugitive_version +%patch4 -p1 +popd %build diff --git a/vimplugin-fugitive-3.2.tar.gz b/vimplugin-fugitive-3.2.tar.gz deleted file mode 100644 index fe1d92e..0000000 --- a/vimplugin-fugitive-3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39deb5d84cee36c76f70428b9f57cd872e94c5b908e8b38d01c0a5763be50634 -size 64708 diff --git a/vimplugin-fugitive-3.3.tar.gz b/vimplugin-fugitive-3.3.tar.gz new file mode 100644 index 0000000..ff920f7 --- /dev/null +++ b/vimplugin-fugitive-3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b98ffde6bfd401d7c06da603658f5979928cd9905470e6b7a7f59ad943ac45f3 +size 71368