SHA256
1
0
forked from pool/vim-plugins

Accepting request 486982 from home:scarabeus_iv:branches:editors

- Fix showmarks script wrt bsc#905770:
  * add patch from upstream https://github.com/vim-scripts/ShowMarks/pull/3:
    + showmarks-signs.patch

OBS-URL: https://build.opensuse.org/request/show/486982
OBS-URL: https://build.opensuse.org/package/show/editors/vim-plugins?expand=0&rev=48
This commit is contained in:
Martin Pluskal 2017-04-10 08:26:31 +00:00 committed by Git OBS Bridge
parent a00a69b2d3
commit 605ab05871
3 changed files with 34 additions and 1 deletions

22
showmarks-signs.patch Normal file
View File

@ -0,0 +1,22 @@
From e752d376f3566b9ca646914d148259097fdc713a Mon Sep 17 00:00:00 2001
From: Tobias Gehring <tobias.gehring@fysik.dtu.dk>
Date: Sat, 4 Oct 2014 17:37:23 +0200
Subject: [PATCH] vim doesn't allow signs at the first line any more
---
plugin/showmarks.vim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugin/showmarks.vim b/plugin/showmarks.vim
index affd240..80d9ab1 100644
--- a/plugin/showmarks.vim
+++ b/plugin/showmarks.vim
@@ -372,7 +372,7 @@ fun! s:ShowMarks()
exe 'hi link '.s:ShowMarksDLink{nm}.nm.' '.b:ShowMarksLink{nm}
endif
let mark_at{ln} = nm
- if !exists('b:placed_'.nm) || b:placed_{nm} != ln
+ if ln > 0 && (!exists('b:placed_'.nm) || b:placed_{nm} != ln)
exe 'sign unplace '.id.' buffer='.winbufnr(0)
exe 'sign place '.id.' name=ShowMark'.nm.' line='.ln.' buffer='.winbufnr(0)
let b:placed_{nm} = ln

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 10 08:15:38 UTC 2017 - tchvatal@suse.com
- Fix showmarks script wrt bsc#905770:
* add patch from upstream https://github.com/vim-scripts/ShowMarks/pull/3:
+ showmarks-signs.patch
-------------------------------------------------------------------
Tue Aug 16 11:26:24 UTC 2016 - astieger@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package vim-plugins
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -94,6 +94,7 @@ Source34: https://github.com/editorconfig/editorconfig-vim/archive/v%{edit
Source35: https://github.com/tpope/vim-fugitive/archive/v%{fugitive_version}.tar.gz#/vimplugin-fugitive-%{fugitive_version}.tar.gz
Source100: https://raw.githubusercontent.com/openSUSE/pack-tools/master/contrib/vim/spec.snippets
Patch1: locateopen-1.3-locate-support.patch
Patch2: showmarks-signs.patch
BuildRequires: vim
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -590,6 +591,9 @@ Provides git integration with vim.
pushd vimplugin-locateopen-%locateopen_version
%patch1
popd
pushd vimplugin-showmarks-%showmarks_version
%patch2 -p1
popd
%build