vim colorscheme slate, review console colors

4 files changed, 52 insertions, 40 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index f563f8b4..e9eaf540 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -25,6 +25,10 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1
 
   * sysenv, remove repeated method
 
+  * vim colorscheme Slate, review console colors
+    * change warning and diff colors, so as not to conflict
+    * review cterm colors
+    * for console use color names instead of numbers
 %% 2.9.0.orig.tar.gz (2011-03-24:12/4) [see 3.0.5]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index ab9c925d..32524636 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -29,6 +29,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
 
   * sysenv, remove repeated method
 
+  * vim colorscheme Slate, review console colors
+    * change warning and diff colors, so as not to conflict
+    * review cterm colors
+    * for console use color names instead of numbers
 %% 3.0.5.orig.tar.gz (2011-03-24:12/4)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.5-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.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 64ae0ff1..e192869b 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,6 +1,8 @@
 "%% SiSU Vim color file
+" Name:             Slate
 " Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" (originally looked at desert Hans Fugal <hans@fugal.net> http://hans.fugal.net/vim/colors/desert.vim (April/May 2003)
+" last updated:     2011-03-30
+" (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
 if version > 580
@@ -10,50 +12,50 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal guifg=White guibg=grey15
+:hi Normal guifg=white guibg=grey15
 :hi Cursor guibg=khaki guifg=slategrey
 :hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey
-:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7
+:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=black
+:hi FoldColumn guibg=black guifg=grey20 ctermfg=darkblue ctermbg=grey
 :hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green
 :hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown
 :hi MoreMsg guifg=SeaGreen ctermfg=darkgreen
 :hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue
 :hi Question guifg=springgreen ctermfg=green
-:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue
+:hi Search guibg=peru guifg=wheat ctermfg=darkgreen ctermbg=yellow
 :hi SpecialKey guifg=yellowgreen ctermfg=darkgreen
 :hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse
 :hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
 :hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow
 :hi Statement guifg=CornflowerBlue ctermfg=lightblue
 :hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
-:hi WarningMsg guifg=salmon ctermfg=1
 :hi String guifg=SkyBlue ctermfg=darkcyan
-:hi Comment term=bold ctermfg=11 guifg=grey40
+:hi Comment term=bold ctermfg=grey guifg=grey40
 :hi Constant guifg=#ffa0a0 ctermfg=brown
 :hi Special guifg=darkkhaki ctermfg=brown
 :hi Identifier guifg=salmon ctermfg=red
 :hi Include guifg=red ctermfg=red
 :hi PreProc guifg=red guibg=white ctermfg=red
-:hi Operator guifg=Red ctermfg=Red
+:hi Operator guifg=red ctermfg=red
 :hi Define guifg=gold gui=bold ctermfg=yellow
-:hi Type guifg=CornflowerBlue ctermfg=2
+:hi Type guifg=CornflowerBlue ctermfg=darkgreen
 :hi Function guifg=navajowhite ctermfg=brown
 :hi Structure guifg=green ctermfg=green
-:hi LineNr guifg=grey50 ctermfg=3
-:hi Ignore guifg=grey40 cterm=bold ctermfg=7
+:hi LineNr guifg=grey50 ctermfg=darkyellow
+:hi Ignore guifg=grey40 cterm=bold ctermfg=grey
 :hi Todo guifg=orangered guibg=yellow2
 :hi Directory ctermfg=darkcyan
-:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
 :hi VisualNOS cterm=bold,underline
-:hi WildMenu ctermfg=0 ctermbg=3
-:hi DiffAdd ctermbg=4
-:hi DiffChange ctermbg=5
-:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
-:hi DiffText cterm=bold ctermbg=1
-:hi Underlined cterm=underline ctermfg=5
-:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
+:hi WildMenu ctermfg=black ctermbg=darkyellow
+: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 guifg=salmon guibg=darkmagenta ctermfg=black ctermbg=darkmagenta
+:hi ErrorMsg cterm=bold guifg=white guibg=darkred cterm=bold ctermfg=grey ctermbg=darkmagenta
+:hi Error guifg=white guibg=darkred cterm=bold ctermfg=grey ctermbg=darkmagenta
+:hi SpellErrors guifg=white guibg=darkred cterm=bold ctermfg=grey ctermbg=darkmagenta
 :hi CursorLine guibg=black ctermbg=black
 :hi CursorColumn guibg=black ctermbg=black
 
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 64ae0ff1..e192869b 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,6 +1,8 @@
 "%% SiSU Vim color file
+" Name:             Slate
 " Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" (originally looked at desert Hans Fugal <hans@fugal.net> http://hans.fugal.net/vim/colors/desert.vim (April/May 2003)
+" last updated:     2011-03-30
+" (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
 if version > 580
@@ -10,50 +12,50 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal guifg=White guibg=grey15
+:hi Normal guifg=white guibg=grey15
 :hi Cursor guibg=khaki guifg=slategrey
 :hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey
-:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7
+:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=black
+:hi FoldColumn guibg=black guifg=grey20 ctermfg=darkblue ctermbg=grey
 :hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green
 :hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown
 :hi MoreMsg guifg=SeaGreen ctermfg=darkgreen
 :hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue
 :hi Question guifg=springgreen ctermfg=green
-:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue
+:hi Search guibg=peru guifg=wheat ctermfg=darkgreen ctermbg=yellow
 :hi SpecialKey guifg=yellowgreen ctermfg=darkgreen
 :hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse
 :hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
 :hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow
 :hi Statement guifg=CornflowerBlue ctermfg=lightblue
 :hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
-:hi WarningMsg guifg=salmon ctermfg=1
 :hi String guifg=SkyBlue ctermfg=darkcyan
-:hi Comment term=bold ctermfg=11 guifg=grey40
+:hi Comment term=bold ctermfg=grey guifg=grey40
 :hi Constant guifg=#ffa0a0 ctermfg=brown
 :hi Special guifg=darkkhaki ctermfg=brown
 :hi Identifier guifg=salmon ctermfg=red
 :hi Include guifg=red ctermfg=red
 :hi PreProc guifg=red guibg=white ctermfg=red
-:hi Operator guifg=Red ctermfg=Red
+:hi Operator guifg=red ctermfg=red
 :hi Define guifg=gold gui=bold ctermfg=yellow
-:hi Type guifg=CornflowerBlue ctermfg=2
+:hi Type guifg=CornflowerBlue ctermfg=darkgreen
 :hi Function guifg=navajowhite ctermfg=brown
 :hi Structure guifg=green ctermfg=green
-:hi LineNr guifg=grey50 ctermfg=3
-:hi Ignore guifg=grey40 cterm=bold ctermfg=7
+:hi LineNr guifg=grey50 ctermfg=darkyellow
+:hi Ignore guifg=grey40 cterm=bold ctermfg=grey
 :hi Todo guifg=orangered guibg=yellow2
 :hi Directory ctermfg=darkcyan
-:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
 :hi VisualNOS cterm=bold,underline
-:hi WildMenu ctermfg=0 ctermbg=3
-:hi DiffAdd ctermbg=4
-:hi DiffChange ctermbg=5
-:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
-:hi DiffText cterm=bold ctermbg=1
-:hi Underlined cterm=underline ctermfg=5
-:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
+:hi WildMenu ctermfg=black ctermbg=darkyellow
+: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 guifg=salmon guibg=darkmagenta ctermfg=black ctermbg=darkmagenta
+:hi ErrorMsg cterm=bold guifg=white guibg=darkred cterm=bold ctermfg=grey ctermbg=darkmagenta
+:hi Error guifg=white guibg=darkred cterm=bold ctermfg=grey ctermbg=darkmagenta
+:hi SpellErrors guifg=white guibg=darkred cterm=bold ctermfg=grey ctermbg=darkmagenta
 :hi CursorLine guibg=black ctermbg=black
 :hi CursorColumn guibg=black ctermbg=black