From d987486be7145ff30ee135c97f8073d41d50902e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Sep 22 2021 06:20:28 +0000 Subject: Revert "vim-7.4-syncolor.patch: remove downstream patch" This reverts commit c39933690f4f165c44ac960b85151b8c32a7e0e3. --- diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch new file mode 100644 index 0000000..b41f2fe --- /dev/null +++ b/vim-7.4-syncolor.patch @@ -0,0 +1,26 @@ +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"), + CENT("DiffChange term=bold ctermbg=LightMagenta", + "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"), + CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan", +@@ -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"), + 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 97eb297..c993dbc 100644 --- a/vim.spec +++ b/vim.spec @@ -62,6 +62,7 @@ BuildRequires: hunspell-devel # reported upstream as https://github.com/vim/vim/pull/8882 Patch3000: vim-7.4-syntax.patch Patch3007: vim-7.4-fstabsyntax.patch +Patch3008: vim-7.4-syncolor.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch Patch3013: vim-7.4-globalsyntax.patch @@ -325,6 +326,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3000 -p1 %patch3007 -p1 -b .fstabsyntax +%patch3008 -p1 -b .syncolor %patch3010 -p1 %patch3011 -p1 %patch3013 -p1