diff --git a/salt-syntax-avoid-multiline-lets.patch b/salt-syntax-avoid-multiline-lets.patch new file mode 100644 index 0000000..880c577 --- /dev/null +++ b/salt-syntax-avoid-multiline-lets.patch @@ -0,0 +1,30 @@ +From: Jiri Slaby +Date: Tue, 8 Nov 2022 07:57:01 +0100 +Subject: syntax: avoid multiline lets +Patch-mainline: not yet +References: bsc#1205034 + +They are not allowed anymore. + +Signed-off-by: Jiri Slaby +--- + syntax/sls.vim | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/syntax/sls.vim b/syntax/sls.vim +index 18fc4875..481e8376 100644 +--- a/syntax/sls.vim ++++ b/syntax/sls.vim +@@ -64,8 +64,6 @@ highlight link salt_stateSpecialArgs Special + syn keyword salt_stateErrors requires requires_in watches watches_in includes extends containedin=yamlBlockMappingKey + highlight link salt_stateErrors Error + +-let g:NERDCustomDelimiters = { +- \ 'sls': { 'left': '#' }, +-\ } ++let g:NERDCustomDelimiters = { 'sls': { 'left': '#' }, } + + let b:current_syntax = "sls" +-- +2.35.3 + diff --git a/vim-plugins.changes b/vim-plugins.changes index ac95bc0..2c441ad 100644 --- a/vim-plugins.changes +++ b/vim-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 8 07:00:33 UTC 2022 - Jiri Slaby + +- add salt-syntax-avoid-multiline-lets.patch (bsc#1205034) +- update + * NERDcommenter 2.7.0 + ------------------------------------------------------------------- Thu Oct 20 06:36:04 UTC 2022 - Jiri Slaby diff --git a/vim-plugins.spec b/vim-plugins.spec index da6ec91..5a44e3d 100644 --- a/vim-plugins.spec +++ b/vim-plugins.spec @@ -39,7 +39,7 @@ %define minibufexpl_version 6.3.2 %define multiplesearch_version 1.3 %define neomutt_version 20220612 -%define NERDcommenter_version 2.6.0 +%define NERDcommenter_version 2.7.0 %define NERDtree_version 6.10.16 %define project_version 1.4.1 %define quilt_version 0.9.7 @@ -108,6 +108,7 @@ Source104: vim-latex-%{latex_version}.tar.xz Source200: gitrebase.vim Source1000: https://raw.githubusercontent.com/openSUSE/pack-tools/master/contrib/vim/spec.snippets Source1001: check_for_updates.pl +Patch0: salt-syntax-avoid-multiline-lets.patch Patch1: locateopen-1.3-locate-support.patch Patch2: showmarks-signs.patch Patch3: file-line-Fix-other-plugins-loading.patch @@ -663,6 +664,9 @@ Usage: %prep %setup -q -c -n %{name} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a26 -a27 -a28 -a30 -a31 -a32 -a33 -a34 -a35 -a100 -a101 -a102 -a103 -a104 +pushd salt-vim-%{salt_version} +%patch0 -p1 +popd # ------- patch locateopen ------ pushd LocateOpen-%locateopen_version %patch1 diff --git a/vimplugin-NERDcommenter-2.6.0.tar.gz b/vimplugin-NERDcommenter-2.6.0.tar.gz deleted file mode 100644 index 8e2d3b8..0000000 --- a/vimplugin-NERDcommenter-2.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a6c3e5135d05a1e04d997909df5100814be72a14fa4a3ff86a5c8a0a4e340c9 -size 41574 diff --git a/vimplugin-NERDcommenter-2.7.0.tar.gz b/vimplugin-NERDcommenter-2.7.0.tar.gz new file mode 100644 index 0000000..5b44def --- /dev/null +++ b/vimplugin-NERDcommenter-2.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53d8ac4656a1937d4b1614dda396ac276ce65b18f10d8f40bfe1af8d017c964b +size 41383