From 17a8502ba1d84edaa5f94fba35fcf035cc842794 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Sep 23 2021 12:28:38 +0000 Subject: vim-7.4-syncolor.patch: Really remove the downstream patch Other test suite errors were caused by another downstream patch, so remove this one again. --- diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch deleted file mode 100644 index b41f2fe..0000000 --- a/vim-7.4-syncolor.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 5adc178..06582a6 100644 --- a/vim.spec +++ b/vim.spec @@ -62,7 +62,6 @@ 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 @@ -326,7 +325,6 @@ 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