rpm/vim-plugins
SHA256
1
0
Fork 0
forked from pool/vim-plugins
Code Pull Requests Activity

Accepting request 910123 from editors

Browse Source 
Fixes vim-fugitive with current vim.

OBS-URL: https://build.opensuse.org/request/show/910123
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim-plugins?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2021-08-04 20:28:58 +00:00 committed by Git OBS Bridge
commit 6db0d45b79
5 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
vim-fugitive-Remove-unnecessary-complete-on-command-with-no-argum.patch Normal file
View File

@ -0,0 +1,43 @@
From: Tim Pope <code@tpope.net>
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 <jslaby@suse.cz>
---
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(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq exe fugitive#WqCommand( <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject GDelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=0 GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=0 GDelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject GMove exe fugitive#MoveCommand( <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete GRename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
if exists(':Gremove') != 2 && get(g:, 'fugitive_legacy_commands', 1)
- exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+ exe 'command! -bar -bang -nargs=0 Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
\ '|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(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+ exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
\ '|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

6
vim-plugins.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 3 11:22:05 UTC 2021 - Jiri Slaby <jslaby@suse.cz>
- 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 <jslaby@suse.cz>

6
vim-plugins.spec
View File

@ -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

3
vimplugin-fugitive-3.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39deb5d84cee36c76f70428b9f57cd872e94c5b908e8b38d01c0a5763be50634
size 64708

3
vimplugin-fugitive-3.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b98ffde6bfd401d7c06da603658f5979928cd9905470e6b7a7f59ad943ac45f3
size 71368