rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

vim-7.4-syncolor.patch: remove downstream patch

Browse Source 
Remove a downstream patch which changed colors in 'vim -d' and 'vimdiff'
- it breaks upstream test suite and the diff is readable without it, so
IMO it is sufficient for its removal.
This commit is contained in:
Zdenek Dohnal 2021-09-21 08:56:29 +02:00
parent 5135ccc327
commit c39933690f
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vim-7.4-syncolor.patch
View File

@ -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",

2
vim.spec
View File

@ -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