v2 v3: vim slate colorscheme, conflicting group colors reviewed

4 files changed, 116 insertions, 92 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index be09c114..72dab41a 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -15,6 +15,8 @@ Reverse Chronological:
 %% 2.9.2.orig.tar.gz (2011-04-19:16/2) [see 3.0.7]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1
 
+  * vim colors colorscheme Slate, review conflicting group colors
+
 %% 2.9.1.orig.tar.gz (2011-03-30:13/3) [see 3.0.6]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8211755a..a95ff3d2 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -22,6 +22,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
 
   * urls, share/reuse code, fix show all urls -U
 
+  * vim colors colorscheme Slate, review conflicting group colors
+
 %% 3.0.6.orig.tar.gz (2011-03-30:13/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.6-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
index 01a6c057..7302f8e4 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,7 +1,7 @@
 "%% SiSU Vim color file
 " Name:             Slate
 " Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" last updated:     2011-03-30
+" last updated:     2011-04-11
 " (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
 :set background=dark
 :highlight clear
@@ -12,50 +12,60 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal                                                                              guibg=grey15      guifg=white
-:hi Cursor                                                                              guibg=khaki       guifg=slategrey
-:hi VertSplit    cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Folded                            ctermbg=black       ctermfg=grey                  guibg=black       guifg=grey40
-:hi FoldColumn                        ctermbg=grey        ctermfg=darkblue              guibg=black       guifg=grey20
-:hi IncSearch    cterm=none           ctermbg=green       ctermfg=yellow                guibg=black       guifg=green
-:hi ModeMsg      cterm=none                               ctermfg=brown                                   guifg=goldenrod
-:hi MoreMsg                                               ctermfg=darkgreen                               guifg=SeaGreen
-:hi NonText      cterm=bold                               ctermfg=blue                  guibg=grey15      guifg=RoyalBlue
-:hi Question                                              ctermfg=green                                   guifg=springgreen
-:hi Search                            ctermbg=yellow      ctermfg=darkgreen             guibg=peru        guifg=wheat
-:hi SpecialKey                                            ctermfg=darkgreen                               guifg=yellowgreen
-:hi StatusLine   cterm=bold,reverse                                            gui=none guibg=#c2bfa5     guifg=black
-:hi StatusLineNC cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Title        cterm=bold                               ctermfg=yellow       gui=bold                   guifg=gold
-:hi Statement                                             ctermfg=lightblue                               guifg=CornflowerBlue
-:hi Visual       cterm=reverse                                                 gui=none guibg=olivedrab   guifg=khaki
-:hi String                                                ctermfg=darkcyan                                guifg=SkyBlue
-:hi Comment      term=bold                                ctermfg=grey                                    guifg=grey40
-:hi Constant                                              ctermfg=brown                                   guifg=#ffa0a0
-:hi Special                                               ctermfg=brown                                   guifg=darkkhaki
-:hi Identifier                                            ctermfg=red                                     guifg=salmon
-:hi Include                                               ctermfg=red                                     guifg=red
-:hi PreProc                                               ctermfg=red                   guibg=white       guifg=red
-:hi Operator                                              ctermfg=red                                     guifg=red
-:hi Define                                                ctermfg=yellow       gui=bold                   guifg=gold
-:hi Type                                                  ctermfg=darkgreen                               guifg=CornflowerBlue
-:hi Function                                              ctermfg=brown                                   guifg=navajowhite
-:hi Structure                                             ctermfg=green                                   guifg=green
-:hi LineNr                                                ctermfg=darkyellow                              guifg=grey50
-:hi Ignore       cterm=bold                               ctermfg=grey                                    guifg=grey40
-:hi Todo                                                                                guibg=yellow2     guifg=orangered
-:hi Directory                                             ctermfg=darkcyan
+:hi Normal                             ctermbg=black                                     guibg=grey15        guifg=white
+:hi Cursor                                                                               guibg=khaki         guifg=slategrey
+:hi VertSplit    cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Folded                             ctermbg=black       ctermfg=grey                  guibg=black         guifg=grey40
+:hi FoldColumn                         ctermbg=grey        ctermfg=darkblue              guibg=black         guifg=grey20
+:hi IncSearch    cterm=none            ctermbg=green       ctermfg=yellow                guibg=black         guifg=green
+:hi ModeMsg      cterm=none                                ctermfg=brown                                     guifg=goldenrod
+:hi MoreMsg                                                ctermfg=darkgreen                                 guifg=SeaGreen
+:hi NonText      cterm=bold                                ctermfg=blue                  guibg=grey15        guifg=RoyalBlue
+:hi Question                                               ctermfg=green                                     guifg=springgreen
+:hi Search                             ctermbg=yellow      ctermfg=darkgreen             guibg=peru          guifg=wheat
+:hi SpecialKey                                             ctermfg=darkgreen                                 guifg=yellowgreen
+:hi StatusLine   cterm=bold,reverse                                            gui=none  guibg=#c2bfa5       guifg=black
+:hi StatusLineNC cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Title        cterm=bold                                ctermfg=yellow      gui=bold                      guifg=gold
+:hi Statement                                              ctermfg=lightblue                                 guifg=CornflowerBlue
+:hi Visual       cterm=reverse                                                 gui=none  guibg=olivedrab     guifg=khaki
+:hi String                                                 ctermfg=darkcyan                                  guifg=SkyBlue
+:hi Comment      term=bold                                 ctermfg=grey                                      guifg=grey40
+:hi Constant                                               ctermfg=brown                                     guifg=#ffa0a0
+:hi Special                                                ctermfg=brown                                     guifg=darkkhaki
+:hi Identifier                                             ctermfg=red                                       guifg=salmon
+:hi Include                                                ctermfg=red                                       guifg=red
+:hi PreProc                                                ctermfg=red                   guibg=white         guifg=red
+:hi Operator                                               ctermfg=red                                       guifg=red
+:hi Define                                                 ctermfg=yellow      gui=bold                      guifg=gold
+:hi Type                                                   ctermfg=darkgreen                                 guifg=CornflowerBlue
+:hi Function                                               ctermfg=brown                                     guifg=navajowhite
+:hi Structure                                              ctermfg=green                                     guifg=green
+:hi LineNr                             ctermbg=darkgrey    ctermfg=black                                     guifg=grey50
+:hi Ignore       cterm=bold                                ctermfg=grey                                      guifg=grey40
+:hi Todo                                                                                 guibg=yellow2       guifg=orangered
+:hi Directory                                              ctermfg=darkcyan
 :hi VisualNOS    cterm=bold,underline
-:hi WildMenu                          ctermbg=darkyellow  ctermfg=black
-:hi DiffChange   cterm=none           ctermbg=darkgrey    ctermfg=white
-:hi DiffText     cterm=none           ctermbg=darkcyan    ctermfg=white
-:hi DiffAdd      cterm=none           ctermbg=darkgreen   ctermfg=white
-:hi DiffDelete   cterm=none           ctermbg=darkgrey    ctermfg=black
-:hi Underlined   cterm=underline                          ctermfg=darkmagenta
-:hi WarningMsg                        ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta guifg=salmon
-:hi ErrorMsg     cterm=bold                                                             guibg=darkred     guifg=white
-:hi Error        cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi SpellErrors  cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi CursorLine                        ctermbg=black                                     guibg=black
-:hi CursorColumn                      ctermbg=black                                     guibg=black
+:hi WildMenu                           ctermbg=darkyellow  ctermfg=black                 guibg=darkyellow    guifg=black
+:hi DiffChange   cterm=none            ctermbg=darkgrey    ctermfg=white                 guibg=darkgrey      guifg=white
+:hi DiffText     cterm=none            ctermbg=darkcyan    ctermfg=white                 guibg=darkcyan      guifg=white
+:hi DiffAdd      cterm=none            ctermbg=darkgreen   ctermfg=white                 guibg=darkgreen     guifg=white
+:hi DiffDelete   cterm=none            ctermbg=darkgrey    ctermfg=black                 guibg=darkgrey      guifg=black
+:hi Underlined   term=underline                            ctermfg=darkmagenta
+:hi WarningMsg                         ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta   guifg=salmon
+:hi ErrorMsg     cterm=bold            ctermbg=darkmagenta ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi Error        cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellErrors  cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellBad     cterm=bold            ctermbg=magenta     ctermfg=black                 guibg=darkmagenta   guifg=white
+:hi SpellLocal                         ctermbg=blue        ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi CursorLine                         ctermbg=black                                     guibg=black
+:hi CursorColumn                       ctermbg=black                                     guibg=black
+:hi Black                              ctermbg=grey        ctermfg=black                 guibg=grey          guifg=black
+:hi Red                                ctermbg=black       ctermfg=red                   guibg=black         guifg=red
+:hi Magenta                            ctermbg=black       ctermfg=magenta               guibg=black         guifg=magenta
+:hi Blue                               ctermbg=black       ctermfg=blue                  guibg=black         guifg=blue
+:hi Cyan                               ctermbg=black       ctermfg=cyan                  guibg=black         guifg=cyan
+:hi Green                              ctermbg=black       ctermfg=green                 guibg=black         guifg=green
+:hi Yellow                             ctermbg=black       ctermfg=yellow                guibg=black         guifg=yellow
+:hi White                              ctermbg=black       ctermfg=white                 guibg=black         guifg=white
 
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
index 01a6c057..7302f8e4 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,7 +1,7 @@
 "%% SiSU Vim color file
 " Name:             Slate
 " Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" last updated:     2011-03-30
+" last updated:     2011-04-11
 " (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
 :set background=dark
 :highlight clear
@@ -12,50 +12,60 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal                                                                              guibg=grey15      guifg=white
-:hi Cursor                                                                              guibg=khaki       guifg=slategrey
-:hi VertSplit    cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Folded                            ctermbg=black       ctermfg=grey                  guibg=black       guifg=grey40
-:hi FoldColumn                        ctermbg=grey        ctermfg=darkblue              guibg=black       guifg=grey20
-:hi IncSearch    cterm=none           ctermbg=green       ctermfg=yellow                guibg=black       guifg=green
-:hi ModeMsg      cterm=none                               ctermfg=brown                                   guifg=goldenrod
-:hi MoreMsg                                               ctermfg=darkgreen                               guifg=SeaGreen
-:hi NonText      cterm=bold                               ctermfg=blue                  guibg=grey15      guifg=RoyalBlue
-:hi Question                                              ctermfg=green                                   guifg=springgreen
-:hi Search                            ctermbg=yellow      ctermfg=darkgreen             guibg=peru        guifg=wheat
-:hi SpecialKey                                            ctermfg=darkgreen                               guifg=yellowgreen
-:hi StatusLine   cterm=bold,reverse                                            gui=none guibg=#c2bfa5     guifg=black
-:hi StatusLineNC cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
-:hi Title        cterm=bold                               ctermfg=yellow       gui=bold                   guifg=gold
-:hi Statement                                             ctermfg=lightblue                               guifg=CornflowerBlue
-:hi Visual       cterm=reverse                                                 gui=none guibg=olivedrab   guifg=khaki
-:hi String                                                ctermfg=darkcyan                                guifg=SkyBlue
-:hi Comment      term=bold                                ctermfg=grey                                    guifg=grey40
-:hi Constant                                              ctermfg=brown                                   guifg=#ffa0a0
-:hi Special                                               ctermfg=brown                                   guifg=darkkhaki
-:hi Identifier                                            ctermfg=red                                     guifg=salmon
-:hi Include                                               ctermfg=red                                     guifg=red
-:hi PreProc                                               ctermfg=red                   guibg=white       guifg=red
-:hi Operator                                              ctermfg=red                                     guifg=red
-:hi Define                                                ctermfg=yellow       gui=bold                   guifg=gold
-:hi Type                                                  ctermfg=darkgreen                               guifg=CornflowerBlue
-:hi Function                                              ctermfg=brown                                   guifg=navajowhite
-:hi Structure                                             ctermfg=green                                   guifg=green
-:hi LineNr                                                ctermfg=darkyellow                              guifg=grey50
-:hi Ignore       cterm=bold                               ctermfg=grey                                    guifg=grey40
-:hi Todo                                                                                guibg=yellow2     guifg=orangered
-:hi Directory                                             ctermfg=darkcyan
+:hi Normal                             ctermbg=black                                     guibg=grey15        guifg=white
+:hi Cursor                                                                               guibg=khaki         guifg=slategrey
+:hi VertSplit    cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Folded                             ctermbg=black       ctermfg=grey                  guibg=black         guifg=grey40
+:hi FoldColumn                         ctermbg=grey        ctermfg=darkblue              guibg=black         guifg=grey20
+:hi IncSearch    cterm=none            ctermbg=green       ctermfg=yellow                guibg=black         guifg=green
+:hi ModeMsg      cterm=none                                ctermfg=brown                                     guifg=goldenrod
+:hi MoreMsg                                                ctermfg=darkgreen                                 guifg=SeaGreen
+:hi NonText      cterm=bold                                ctermfg=blue                  guibg=grey15        guifg=RoyalBlue
+:hi Question                                               ctermfg=green                                     guifg=springgreen
+:hi Search                             ctermbg=yellow      ctermfg=darkgreen             guibg=peru          guifg=wheat
+:hi SpecialKey                                             ctermfg=darkgreen                                 guifg=yellowgreen
+:hi StatusLine   cterm=bold,reverse                                            gui=none  guibg=#c2bfa5       guifg=black
+:hi StatusLineNC cterm=reverse                                                 gui=none  guibg=#c2bfa5       guifg=grey40
+:hi Title        cterm=bold                                ctermfg=yellow      gui=bold                      guifg=gold
+:hi Statement                                              ctermfg=lightblue                                 guifg=CornflowerBlue
+:hi Visual       cterm=reverse                                                 gui=none  guibg=olivedrab     guifg=khaki
+:hi String                                                 ctermfg=darkcyan                                  guifg=SkyBlue
+:hi Comment      term=bold                                 ctermfg=grey                                      guifg=grey40
+:hi Constant                                               ctermfg=brown                                     guifg=#ffa0a0
+:hi Special                                                ctermfg=brown                                     guifg=darkkhaki
+:hi Identifier                                             ctermfg=red                                       guifg=salmon
+:hi Include                                                ctermfg=red                                       guifg=red
+:hi PreProc                                                ctermfg=red                   guibg=white         guifg=red
+:hi Operator                                               ctermfg=red                                       guifg=red
+:hi Define                                                 ctermfg=yellow      gui=bold                      guifg=gold
+:hi Type                                                   ctermfg=darkgreen                                 guifg=CornflowerBlue
+:hi Function                                               ctermfg=brown                                     guifg=navajowhite
+:hi Structure                                              ctermfg=green                                     guifg=green
+:hi LineNr                             ctermbg=darkgrey    ctermfg=black                                     guifg=grey50
+:hi Ignore       cterm=bold                                ctermfg=grey                                      guifg=grey40
+:hi Todo                                                                                 guibg=yellow2       guifg=orangered
+:hi Directory                                              ctermfg=darkcyan
 :hi VisualNOS    cterm=bold,underline
-:hi WildMenu                          ctermbg=darkyellow  ctermfg=black
-:hi DiffChange   cterm=none           ctermbg=darkgrey    ctermfg=white
-:hi DiffText     cterm=none           ctermbg=darkcyan    ctermfg=white
-:hi DiffAdd      cterm=none           ctermbg=darkgreen   ctermfg=white
-:hi DiffDelete   cterm=none           ctermbg=darkgrey    ctermfg=black
-:hi Underlined   cterm=underline                          ctermfg=darkmagenta
-:hi WarningMsg                        ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta guifg=salmon
-:hi ErrorMsg     cterm=bold                                                             guibg=darkred     guifg=white
-:hi Error        cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi SpellErrors  cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
-:hi CursorLine                        ctermbg=black                                     guibg=black
-:hi CursorColumn                      ctermbg=black                                     guibg=black
+:hi WildMenu                           ctermbg=darkyellow  ctermfg=black                 guibg=darkyellow    guifg=black
+:hi DiffChange   cterm=none            ctermbg=darkgrey    ctermfg=white                 guibg=darkgrey      guifg=white
+:hi DiffText     cterm=none            ctermbg=darkcyan    ctermfg=white                 guibg=darkcyan      guifg=white
+:hi DiffAdd      cterm=none            ctermbg=darkgreen   ctermfg=white                 guibg=darkgreen     guifg=white
+:hi DiffDelete   cterm=none            ctermbg=darkgrey    ctermfg=black                 guibg=darkgrey      guifg=black
+:hi Underlined   term=underline                            ctermfg=darkmagenta
+:hi WarningMsg                         ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta   guifg=salmon
+:hi ErrorMsg     cterm=bold            ctermbg=darkmagenta ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi Error        cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellErrors  cterm=bold            ctermbg=darkmagenta ctermfg=grey                  guibg=darkmagenta   guifg=white
+:hi SpellBad     cterm=bold            ctermbg=magenta     ctermfg=black                 guibg=darkmagenta   guifg=white
+:hi SpellLocal                         ctermbg=blue        ctermfg=white                 guibg=darkmagenta   guifg=white
+:hi CursorLine                         ctermbg=black                                     guibg=black
+:hi CursorColumn                       ctermbg=black                                     guibg=black
+:hi Black                              ctermbg=grey        ctermfg=black                 guibg=grey          guifg=black
+:hi Red                                ctermbg=black       ctermfg=red                   guibg=black         guifg=red
+:hi Magenta                            ctermbg=black       ctermfg=magenta               guibg=black         guifg=magenta
+:hi Blue                               ctermbg=black       ctermfg=blue                  guibg=black         guifg=blue
+:hi Cyan                               ctermbg=black       ctermfg=cyan                  guibg=black         guifg=cyan
+:hi Green                              ctermbg=black       ctermfg=green                 guibg=black         guifg=green
+:hi Yellow                             ctermbg=black       ctermfg=yellow                guibg=black         guifg=yellow
+:hi White                              ctermbg=black       ctermfg=white                 guibg=black         guifg=white