vim, minor update, not syntax related

3 files changed, 162 insertions, 35 deletions

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 8f704718..9cb8952a 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -3,7 +3,8 @@
 " SiSU Markup:     SiSU (sisu-3.3) 2012-08-18
 " an ftplugin setting defaults for editing sisu markup files
 :syntax on
-:filetype on
+:filetype off
+":filetype on
 :filetype indent on
 :autocmd FileType sisu :set nonumber
 :set encoding=utf-8 fileencodings=
@@ -30,40 +31,49 @@
     \set guioptions-=T <Bar>
   \endif<CR>
 :set paste
-"% statusline
-:set statusline=                        "
-"% [ buffer number ]
-:set statusline +=%#Normal#[            "
-:set statusline +=%#Identifier#%n       " buffer number
-:set statusline +=%#PreProc#%M          " modified flag
-:set statusline +=%#Normal#]            "
-"% [ file name (& modified?) ]
-:set statusline +=%#Normal#\ [          "
-:set statusline +=%#Statement#%<%t      " full path
-:set statusline +=%#PreProc#%M          " modified flag
-:set statusline +=%#Normal#]           "
-"% [ column : line number / number of lines in file, percentage of file ] [%v:%l/%L\ %p%%]
-:set statusline +=%#Normal#\ [          "
-:set statusline +=%#Identifier#%v       " column & line
-:set statusline +=%#Normal#:            "
-:set statusline +=%#Identifier#%l       " column & line
-:set statusline +=%#SpecialKey#/%L\     " total lines
-:set statusline +=%#Identifier#%p       " percentage of file
-:set statusline +=%#SpecialKey#%%       "
-:set statusline +=%#Normal#]            "
-"% [ file format : file type ]
-:set statusline +=%#Normal#\ [          "
-:set statusline +=%#SpecialKey#%{&ff}   " file format
-:set statusline +=%#Normal#:            "
-:set statusline +=%#SpecialKey#%Y       " file type
-:set statusline +=%#Normal#]            "
-"% [ character under cursor ]
-:set statusline +=%#Normal#\ [          "
-:set statusline +=%#String#0x%04B       " character under cursor
-:set statusline +=%#Normal#]\           "
-"%  Status line background
-:set statusline +=%#MatchParen#\       "
-:set laststatus=2       " status line always on
+""% statusline
+"set statusline=                                  "
+"set fillchars=stl:―,stlnc:—,vert:│,fold:۰,diff:·
+"" [ buffer number ]
+"set statusline +=%#Normal#[                      "
+"set statusline +=%#Identifier#%n                 " buffer number
+"set statusline +=%#PreProc#%M                    " modified flag
+"set statusline +=%#Normal#]                      "
+"" [ file name (& modified?) ]
+"set statusline +=%#Normal#\ [                    "
+"set statusline +=%#Statement#%<%F%*              " full path
+""set statusline +=%#Statement#%<%t               " full path
+"set statusline +=%#PreProc#%M                    " modified flag
+"set statusline +=%#Normal#]                      "
+"" [ column : line number / number of lines in file, percentage of file ] [%v:%l/%L\ %p%%]
+"set statusline +=%#Normal#\ [                    "
+"set statusline +=%#Identifier#%v                 " column & line
+"set statusline +=%#Normal#:                      "
+"set statusline +=%#Identifier#%l                 " column & line
+"set statusline +=%#SpecialKey#/%L\               " total lines
+"set statusline +=%#Identifier#%p                 " percentage of file
+"set statusline +=%#SpecialKey#%%                 "
+"set statusline +=%#Normal#]     "                "
+"" [ file format : file type ]
+"set statusline +=%#Normal#\ [                    "
+"set statusline +=%#SpecialKey#%{&fenc}           " file format
+"set statusline +=%#Normal#:                      "
+"set statusline +=%#SpecialKey#%{&ff}             " file format
+"set statusline +=%#Normal#:                      "
+"set statusline +=%#SpecialKey#%y                 " file type
+"set statusline +=%#Normal#]                      "
+"" [ character under cursor ]
+"set statusline +=%#Normal#\ [                    "
+"set statusline +=%#String#0x%04B                 " character under cursor
+"set statusline +=%#Normal#]\                     "
+"" [ syntastic ]
+"set statusline +=%#warningmsg#
+"set statusline +=%{SyntasticStatuslineFlag()}\   "
+""set statusline+=%*
+""  Status line background
+"set statusline +=%#Folded#\                  "
+"" misc
+"set laststatus=2                                 " status line always on
 "% textwrap
 :set whichwrap=<,>,h,l,[,]
 :set nolinebreak        " only affects display not buffer
diff --git a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisurb.vim b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisurb.vim
new file mode 100644
index 00000000..b9596262
--- /dev/null
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisurb.vim
@@ -0,0 +1,7 @@
+:set number
+:set relativenumber
+:autocmd FileType    ruby :set relativenumber
+:autocmd FocusLost   *.rb :set norelativenumber
+:autocmd FocusGained *.rb :set relativenumber
+:autocmd InsertEnter *.rb :set norelativenumber
+:autocmd InsertLeave *.rb :set relativenumber
diff --git a/data/sisu/conf/editor-syntax-etc/vim/rc/vimrc_statusline b/data/sisu/conf/editor-syntax-etc/vim/rc/vimrc_statusline
new file mode 100644
index 00000000..e0ba4938
--- /dev/null
+++ b/data/sisu/conf/editor-syntax-etc/vim/rc/vimrc_statusline
@@ -0,0 +1,110 @@
+set statusline=                                  "
+set fillchars=stl:―,stlnc:—,vert:│,fold:۰,diff:·
+"% [ buffer number ]
+set statusline +=%#Normal#[           "
+set statusline +=%#Identifier#%n      " buffer number
+set statusline +=%#PreProc#%M         " modified flag
+set statusline +=%#Normal#]           "
+"% [ file name (& modified?) ]
+set statusline +=%#Normal#\ [         "
+set statusline +=%#Statement#%<%F%*          " full path
+"set statusline +=%#Statement#%<%t     " full path
+set statusline +=%#PreProc#%M         " modified flag
+set statusline +=%#Normal#]           "
+"% [ column : line number / number of lines in file, percentage of file ] [%v:%l/%L\ %p%%]
+set statusline +=%#Normal#\ [                    "
+set statusline +=%#Identifier#%v                 " column & line
+set statusline +=%#Normal#:                      "
+set statusline +=%#Identifier#%l                 " column & line
+set statusline +=%#SpecialKey#/%L\               " total lines
+set statusline +=%#Identifier#%p                 " percentage of file
+set statusline +=%#SpecialKey#%%                 "
+set statusline +=%#Normal#]     "                "
+"% [ file format : file type ]
+set statusline +=%#Normal#\ [                    "
+set statusline +=%#SpecialKey#%{&fenc}           " file format
+set statusline +=%#Normal#:                      "
+set statusline +=%#SpecialKey#%{&ff}             " file format
+set statusline +=%#Normal#:                      "
+set statusline +=%#SpecialKey#%y                 " file type
+set statusline +=%#Normal#]                      "
+"% [ character under cursor ]
+set statusline +=%#Normal#\ [                    "
+set statusline +=%#String#0x%04B                 " character under cursor
+set statusline +=%#Normal#]\                     "
+"% [ syntastic ]
+set statusline +=%#warningmsg#
+set statusline +=%{SyntasticStatuslineFlag()}\   "
+"set statusline+=%*
+"%  Status line background
+set statusline +=%#Folded#\                  "
+"set statusline +=%#Normal#\                  "
+"set statusline +=%#MatchParen#\                  "
+"set statusline +=%#ColorColumn#\                "
+"set statusline +=%#DiffDelete#\                 "
+"set statusline +=%#VertSplit#\                  "
+"% misc
+set laststatus=2                                 " status line always on
+"set statusline=%F%m%r%h%w\
+"set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%v:%l/%L\ %p%%]
+"<http://www.reddit.com/r/vim/comments/1e6ph1/need_help_with_vim_statusline_customization/>
+"<http://stackoverflow.com/questions/5375240/a-more-useful-statusline-in-vim>
+"<http://got-ravings.blogspot.it/2008/08/vim-pr0n-making-statuslines-that-own.html>
+"! black
+hi User0 guifg=#000000 guibg=#222222
+"! red
+hi User1 guifg=#CC0000 guibg=#222222
+"! green
+hi User2 guifg=#4E9A06 guibg=#222222
+"! yellow
+hi User3 guifg=#C4A000 guibg=#222222
+"! blue
+hi User4 guifg=#5971AD guibg=#222222
+"! magenta
+hi User5 guifg=#75507B guibg=#222222
+"! cyan
+hi User6 guifg=#06989A guibg=#222222
+"! white
+hi User7 guifg=#D3D7CF guibg=#222222
+hi User8 guifg=#ffffff guibg=#222222
+hi User9 guifg=#ffffff guibg=#222222
+"! black
+"Rxvt.color0  : #000000
+"Rxvt.color8  : #555555
+"! red
+"Rxvt.color1  : #CC0000
+"Rxvt.color9  : #EF2929
+"! green
+"Rxvt.color2  : #4E9A06
+"Rxvt.color10 : #8AE234
+"! yellow
+"Rxvt.color3  : #C4A000
+"Rxvt.color11 : #FCE94F
+"! blue
+"Rxvt.color4  : #5971AD
+"Rxvt.color12 : #729FCF
+"! magenta
+"Rxvt.color5  : #75507B
+"Rxvt.color13 : #AD7FA8
+"! cyan
+"Rxvt.color6  : #06989A
+"Rxvt.color14 : #34E2E2
+"! white
+"Rxvt.color7  : #D3D7CF
+"Rxvt.color15 : #EEEEEE
+
+"hi User1 guifg=#eea040 guibg=#222222
+"hi User2 guifg=#dd3333 guibg=#222222
+"hi User3 guifg=#ff66ff guibg=#222222
+"hi User4 guifg=#a0ee40 guibg=#222222
+"hi User5 guifg=#eeee40 guibg=#222222
+"
+"hi User0 guifg=#ffffff guibg=#094afe
+"hi User1 guifg=#ffdad8 guibg=#880c0e
+"hi User2 guifg=#000000 guibg=#F4905C
+"hi User3 guifg=#292b00 guibg=#f4f597
+"hi User4 guifg=#112605 guibg=#aefe7B
+"hi User5 guifg=#051d00 guibg=#7dcc7d
+"hi User7 guifg=#ffffff guibg=#880c0e gui=bold
+"hi User8 guifg=#ffffff guibg=#5b7fbb
+"hi User9 guifg=#ffffff guibg=#810085