diff --git a/.gitignore b/.gitignore index befe273..77ae3cf 100644 --- a/.gitignore +++ b/.gitignore @@ -259,3 +259,4 @@ /vim-8.1-1561.tar.bz2 /vim-8.1-1602.tar.bz2 /vim-8.1-1661.tar.bz2 +/vim-8.1-1713.tar.bz2 diff --git a/sources b/sources index da4eafa..9cc7cfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1661.tar.bz2) = 85df7d8057a569e35768ea8800ba747c5b8e1e746882d074abaaa180df0874cf37b941a0e26847b4a49ce1deca2edd1e6a02476dbc78268d6cd2e3cea3115eba +SHA512 (vim-8.1-1713.tar.bz2) = e6b22ba25164096d399e97d237515df758fe2455618544898504550fa81579ec05cf2803756a7ff2b8bc41eac75659b6336687810b50407c20856f5777fd333a diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch index 440da18..b41f2fe 100644 --- a/vim-7.4-syncolor.patch +++ b/vim-7.4-syncolor.patch @@ -1,25 +1,26 @@ -diff -up vim80/src/syntax.c.syncolor vim80/src/syntax.c ---- vim80/src/syntax.c.syncolor 2017-08-15 12:14:21.716020676 +0200 -+++ vim80/src/syntax.c 2017-08-15 12:30:31.380158974 +0200 -@@ -6972,8 +6972,8 @@ static char *(highlight_init_light[]) = +diff --git a/src/highlight.c b/src/highlight.c +index 9322f96..f7147a0 100644 +--- a/src/highlight.c ++++ b/src/highlight.c +@@ -211,8 +211,8 @@ static char *(highlight_init_light[]) = { CENT("Visual term=reverse", "Visual term=reverse guibg=LightGrey"), #ifdef FEAT_DIFF - CENT("DiffAdd term=bold ctermbg=LightBlue", - "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"), + CENT("DiffAdd term=bold ctermbg=LightRed", -+ "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"), ++ "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"), CENT("DiffChange term=bold ctermbg=LightMagenta", "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"), CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan", -@@ -7066,8 +7066,8 @@ static char *(highlight_init_dark[]) = { +@@ -304,8 +304,8 @@ static char *(highlight_init_dark[]) = { CENT("Visual term=reverse", "Visual term=reverse guibg=DarkGrey"), #ifdef FEAT_DIFF - CENT("DiffAdd term=bold ctermbg=DarkBlue", - "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"), + CENT("DiffAdd term=bold ctermbg=DarkRed", -+ "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"), ++ "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"), CENT("DiffChange term=bold ctermbg=DarkMagenta", "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"), CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan", diff --git a/vim.spec b/vim.spec index ca4aa97..8c87d6a 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1661 +%define patchlevel 1713 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jul 18 2019 Zdenek Dohnal - 2:8.1.1713-1 +- patchlevel 1713 + * Thu Jul 18 2019 Zdenek Dohnal - 2:8.1.1661-2 - 1643311 - add several defaults from Vim upstream and remove forcing fileencodings