Merge tag 'sisu_4.0.7' into debian/sid

SiSU 4.0.7

18 files changed, 99 insertions, 62 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 9cd95b77..0027e209 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -1,4 +1,6 @@
 %% SiSU version 3
+  <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+  <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v3;hb=HEAD>
 v3 branch is legacy: v4 branch supersedes & replaces it
 v3 branch supersedes & replaces v2 branch
 v3 introduces alternative (configurable) output structures
@@ -29,6 +31,21 @@ v1 branch is removed; it is available in sisu =< 2.7
 
 %% Reverse Chronological:
 
+%% 3.3.10.orig.tar.xz (2013-02-10:05/7)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.10
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.10.orig.tar.xz
+  sisu_3.3.10.orig.tar.xz
+  sisu_3.3.10-1.dsc
+
+* v3: vim, minimal color schemes, minor edits
+
+* v3: dbi_discrete, discreet should have been discrete, renames accordingly
+
+* v3: lib, bin/sisu, misc, code headers provide url to online git file source
+  * e.g. bin/sisu * Git
+   <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
+
 %% 3.3.9.orig.tar.xz (2013-02-06:05/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.9
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.9.orig.tar.xz
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 8be362c4..3bf9c1c7 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -1,4 +1,8 @@
 %% SiSU version 4
+  <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+  <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v4;hb=HEAD>
+* debian/changelog
+  <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
 v4 stable branch supersedes & replaces v3 branch
    initial goals:
    * remove/retire "skins"; replace some functionality with headers and/or yml
@@ -17,6 +21,22 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.0.7.orig.tar.xz (2013-02-10:05/7)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.7
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.7.orig.tar.xz
+  sisu_4.0.7.orig.tar.xz
+  sisu_4.0.7-1.dsc
+
+* v4: vim, minimal color schemes, minor edits
+
+* v4: dbi_discrete, discreet should have been discrete, renames accordingly
+
+* v4: lib, bin/sisu, misc, code headers provide url to online git file source
+  * e.g. bin/sisu * Git
+   <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
+
 %% 4.0.6.orig.tar.xz (2013-02-07:05/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.6
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.6-1
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
index 46d618f3..f5bfad97 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            8
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes frugal & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6
 ":hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
index aad6de0f..3960e421 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            frugal-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6
 ":hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
index 03f192df..b40e4448 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            frugal-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 :hi Function                                                                             ctermfg=6
 :hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
index 1ff26a58..44846402 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            frugal
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6                                         guifg=magenta
 ":hi Structure                                                                            ctermfg=2                                         guifg=green
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=white         guifg=black
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=white         guifg=black
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=white         guifg=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 238b27df..e5da6326 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,8 +1,8 @@
 "%% SiSU Vim color file
 " Name:            Slate
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
 " Notes:          cterm now uses frugal-sisu 8 colors for term
 "                 (for gui originally looked at desert Hans Fugal <hans@fugal.net>
 "                  <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
@@ -56,8 +56,8 @@ endif
 :hi Function                                                                             ctermfg=6                                         guifg=navajowhite
 :hi Structure                                                                            ctermfg=2                                         guifg=green
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline                                                       guibg=black
-:hi CursorColumn                            cterm=bold,underline                                                       guibg=black
+:hi CursorLine                              cterm=underline                                                            guibg=black
+:hi CursorColumn                            cterm=bold                                                                 guibg=black
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=darkmagenta   guifg=white
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=darkmagenta   guifg=white
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
index 3d8f92e1..f8271bfc 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            sparse-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6
 ":hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
index 9704dbd2..6bf8e8cf 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            sparse-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 :hi Function                                                                             ctermfg=6
 :hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index a69a13bb..a27b1b0d 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.3.9
-:date_stamp: 2013w05/3
-:date: "2013-02-06"
+:version: 3.3.10
+:date_stamp: 2013w05/7
+:date: "2013-02-10"
 :project: SiSU
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
index 46d618f3..1fcb6e38 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            8
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes frugal & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6
 ":hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
index aad6de0f..487e4084 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            frugal-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6
 ":hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
index 03f192df..9afe2f65 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            frugal-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 :hi Function                                                                             ctermfg=6
 :hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
index 1ff26a58..57727664 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            frugal
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6                                         guifg=magenta
 ":hi Structure                                                                            ctermfg=2                                         guifg=green
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=white         guifg=black
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=white         guifg=black
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=white         guifg=black
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
index 238b27df..eaa22ef0 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,8 +1,8 @@
 "%% SiSU Vim color file
 " Name:            Slate
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
 " Notes:          cterm now uses frugal-sisu 8 colors for term
 "                 (for gui originally looked at desert Hans Fugal <hans@fugal.net>
 "                  <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
@@ -56,8 +56,8 @@ endif
 :hi Function                                                                             ctermfg=6                                         guifg=navajowhite
 :hi Structure                                                                            ctermfg=2                                         guifg=green
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline                                                       guibg=black
-:hi CursorColumn                            cterm=bold,underline                                                       guibg=black
+:hi CursorLine                              cterm=underline                                                            guibg=black
+:hi CursorColumn                            cterm=bold                                                                 guibg=black
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=darkmagenta   guifg=white
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0                     guibg=darkmagenta   guifg=white
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
index 3d8f92e1..f8625c4b 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            sparse-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 ":hi Function                                                                             ctermfg=6
 ":hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
index 9704dbd2..492b888b 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
@@ -1,8 +1,8 @@
 " Vim color file
 " Name:            sparse-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-06-26
-" URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
+" Last Change:     2013-02-09
+" URL:             <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
 :hi clear
@@ -54,8 +54,8 @@ endif
 :hi Function                                                                             ctermfg=6
 :hi Structure                                                                            ctermfg=2
 :hi MatchParen                              cterm=bold               ctermbg=4           ctermfg=7
-:hi CursorLine                              cterm=bold,underline
-:hi CursorColumn                            cterm=bold,underline
+:hi CursorLine                              cterm=underline
+:hi CursorColumn                            cterm=bold
 :hi SpellBad       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellCap       term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
 :hi SpellLocal     term=underline,standout  cterm=none               ctermbg=7           ctermfg=0
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index 564c26c3..30306e4c 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.0.6
-:date_stamp: 2013w05/4
-:date: "2013-02-07"
+:version: 4.0.7
+:date_stamp: 2013w05/7
+:date: "2013-02-10"
 :project: SiSU