aboutsummaryrefslogtreecommitdiffhomepage
path: root/data
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-06-22 01:18:03 -0400
committerRalph Amissah <ralph@amissah.com>2013-06-22 01:18:03 -0400
commit6bf6c320b8ad2cb5aa588575565af70b437aa322 (patch)
treeb2c92c4b75de5c9dcbfb6639e56aac38cf545e67 /data
parentdebian/changelog (4.1.4-1) (diff)
parentv5: general code cleaning (diff)
Merge tag 'sisu_4.1.5' into debian/sid
SiSU 4.1.5
Diffstat (limited to 'data')
-rw-r--r--data/doc/sisu/CHANGELOG_v411
-rw-r--r--data/doc/sisu/CHANGELOG_v513
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def.vim4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim8
-rw-r--r--data/sisu/v4/v/version.yml6
-rw-r--r--data/sisu/v5/v/version.yml6
11 files changed, 46 insertions, 22 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index bf4fd392..a024d2b9 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 4.1.5.orig.tar.xz (2013-06-22:24/6)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.5.orig.tar.xz
+ sisu_4.1.5.orig.tar.xz
+ sisu_4.1.5-1.dsc
+
+* vim
+ * colorscheme def, mark current line
+ * ftplugin sisu.vim, c-\ hard wrap lines to line width (moved from c-j)
+
%% 4.1.4.orig.tar.xz (2013-06-06:22/4)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.4-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 463de70e..0c32c06e 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,19 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 5.0.5.orig.tar.xz (2013-06-22:24/6)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.5.orig.tar.xz
+ sisu_5.0.5.orig.tar.xz
+ sisu_5.0.5-1.dsc
+
+* vim
+ * colorscheme def, mark current line
+ * ftplugin sisu.vim, c-\ hard wrap lines to line width (moved from c-j)
+
+* general code cleaning, propagate back to v4 after testing
+
%% 5.0.4.orig.tar.xz (2013-06-06:22/4)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.4-1
diff --git a/data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim
index f59a2b8e..5f6fef27 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim
@@ -34,7 +34,7 @@ endif
:hi Title ctermfg=1
:hi NonText cterm=bold ctermfg=4
:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi CursorLineNr cterm=bold ctermbg=166 ctermfg=0
:hi Directory ctermfg=4
:hi WildMenu ctermbg=3 ctermfg=0
:hi VertSplit cterm=reverse
@@ -93,7 +93,7 @@ endif
:hi Title guifg=#CC0000
:hi NonText gui=bold guifg=#5971AD
:hi LineNr gui=bold guibg=#000000 guifg=#808080
-:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi CursorLineNr gui=bold guibg=#D75F00 guifg=#000000
:hi Directory guifg=#5971AD
:hi WildMenu guibg=#C4A000 guifg=#000000
:hi VertSplit gui=reverse
diff --git a/data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim
index 14178dc4..9157faca 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim
@@ -34,7 +34,7 @@ endif
:hi Title cterm=bold ctermfg=3
:hi NonText cterm=bold ctermfg=4
:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi CursorLineNr cterm=bold ctermbg=166 ctermfg=0
:hi Directory ctermfg=4
:hi WildMenu ctermbg=3 ctermfg=0
:hi VertSplit cterm=reverse
@@ -93,7 +93,7 @@ endif
:hi Title gui=bold guifg=#C4A000
:hi NonText gui=bold guifg=#5971AD
:hi LineNr gui=bold guibg=#000000 guifg=#808080
-:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi CursorLineNr gui=bold guibg=#D75F00 guifg=#000000
:hi Directory guifg=#5971AD
:hi WildMenu guibg=#C4A000 guifg=#000000
:hi VertSplit gui=reverse
diff --git a/data/sisu/conf/editor-syntax-etc/vim/colors/def.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def.vim
index f7d6282c..66c45ba4 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/colors/def.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def.vim
@@ -34,7 +34,7 @@ endif
:hi Title cterm=bold ctermfg=3
:hi NonText cterm=bold ctermfg=4
:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi CursorLineNr cterm=bold ctermbg=166 ctermfg=0
:hi Directory ctermfg=4
:hi WildMenu ctermbg=3 ctermfg=0
:hi VertSplit cterm=reverse
@@ -93,7 +93,7 @@ endif
:hi Title gui=bold guifg=#C4A000
:hi NonText gui=bold guifg=#5971AD
:hi LineNr gui=bold guibg=#000000 guifg=#808080
-:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi CursorLineNr gui=bold guibg=#D75F00 guifg=#000000
:hi Directory guifg=#5971AD
:hi WildMenu guibg=#C4A000 guifg=#000000
:hi VertSplit gui=reverse
diff --git a/data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
index 09b8a3ce..5b991954 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
@@ -34,7 +34,7 @@ endif
:hi Title ctermfg=160
:hi NonText cterm=bold ctermfg=24
:hi LineNr cterm=bold ctermbg=0 ctermfg=8
-:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi CursorLineNr cterm=bold ctermbg=166 ctermfg=0
:hi Directory ctermfg=24
:hi WildMenu ctermbg=178 ctermfg=0
:hi VertSplit cterm=reverse
@@ -93,7 +93,7 @@ endif
:hi Title guifg=#CC0000
:hi NonText gui=bold guifg=#005F87
:hi LineNr gui=bold guibg=#000000 guifg=#808080
-:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi CursorLineNr gui=bold guibg=#D75F00 guifg=#000000
:hi Directory guifg=#005F87
:hi WildMenu guibg=#DFAF00 guifg=#000000
:hi VertSplit gui=reverse
diff --git a/data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
index d2cd7295..d2a09836 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
@@ -34,7 +34,7 @@ endif
:hi Title cterm=bold ctermfg=178
:hi NonText cterm=bold ctermfg=24
:hi LineNr cterm=bold ctermbg=0 ctermfg=8
-:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi CursorLineNr cterm=bold ctermbg=166 ctermfg=0
:hi Directory ctermfg=24
:hi WildMenu ctermbg=178 ctermfg=0
:hi VertSplit cterm=reverse
@@ -93,7 +93,7 @@ endif
:hi Title gui=bold guifg=#DFAF00
:hi NonText gui=bold guifg=#005F87
:hi LineNr gui=bold guibg=#000000 guifg=#808080
-:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi CursorLineNr gui=bold guibg=#D75F00 guifg=#000000
:hi Directory guifg=#005F87
:hi WildMenu guibg=#DFAF00 guifg=#000000
:hi VertSplit gui=reverse
diff --git a/data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim
index 334c2b01..ca166e20 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim
@@ -34,7 +34,7 @@ endif
:hi Title cterm=bold ctermfg=178
:hi NonText cterm=bold ctermfg=24
:hi LineNr cterm=bold ctermbg=0 ctermfg=8
-:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi CursorLineNr cterm=bold ctermbg=166 ctermfg=0
:hi Directory ctermfg=24
:hi WildMenu ctermbg=178 ctermfg=0
:hi VertSplit cterm=reverse
@@ -93,7 +93,7 @@ endif
:hi Title gui=bold guifg=#DFAF00
:hi NonText gui=bold guifg=#005F87
:hi LineNr gui=bold guibg=#000000 guifg=#808080
-:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi CursorLineNr gui=bold guibg=#D75F00 guifg=#000000
:hi Directory guifg=#005F87
:hi WildMenu guibg=#DFAF00 guifg=#000000
:hi VertSplit gui=reverse
diff --git a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 1da73012..8f704718 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -72,10 +72,10 @@
"% map
":let mapleader = "," " consider
:map <leader>paste :set invpaste<cr>
-"% wrap/formatting paragraph according to the current 'textwidth' with ^J (control-j):
-:imap <C-J> <C-O>gqap
-:nmap <C-J> gqap
-:vmap <C-J> gq
+"% wrap/formatting paragraph according to the current 'textwidth' with ^\ (control-\):
+:imap <C-\> <C-O>gqap
+:nmap <C-\> gqap
+:vmap <C-\> gq
"% save file, go to next file in buffer
:map <leader>nf :w <enter> :n <enter>
"% vimdiff q exits
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index a8779fb8..6941e66f 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 4.1.4
-:date_stamp: 2013w22/4
-:date: "2013-06-06"
+:version: 4.1.5
+:date_stamp: 2013w24/6
+:date: "2013-06-22"
:project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index c1f74d80..a16f5cfb 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 5.0.4
-:date_stamp: 2013w22/4
-:date: "2013-06-06"
+:version: 5.0.5
+:date_stamp: 2013w24/6
+:date: "2013-06-22"
:project: SiSU