X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=a3ffbc6179cfe891046c00fcebed9fb4193bfcf2;hb=1300fd1bbacdb65c9d4b50bb6e22c6ef471df39a;hp=b4da21a29d39464f5afa4500e98f3204ce59328a;hpb=faebfb44ee92d9050ae609184901471ab3690220;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index b4da21a..a3ffbc6 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -68,16 +68,14 @@ highlight CursorColumn ctermfg=cyan ctermbg=red
 " }}}
 
 " Statusline {{{
-highlight User1 ctermbg=blue ctermfg=black
-highlight User2 ctermbg=green ctermfg=black
-highlight User3 ctermbg=yellow ctermfg=black
-highlight User4 ctermbg=red ctermfg=black
 set laststatus=2
-set statusline=%n\|%F%m%r%h%w%q\ %=
-set statusline+=%1*%Y[%{strlen(&fenc)?&fenc:&enc},%{&ff}]
-set statusline+=%2*[%l/%L]
-set statusline+=%3*[%c%V:0x%B]
-set statusline+=%4*%{LintStatus()}
+set statusline=%F\ %m%r%h%w%q%k\ %=
+set statusline+=%n\ %#Question#%Y
+set statusline+=%#DiffChange#%{strlen(&fenc)?&fenc:&enc}\ %{&ff}
+set statusline+=%#DiffAdd#%l/%L
+set statusline+=%#Todo#%c%V:0x%B
+set statusline+=%#Comment#%o
+set statusline+=%#Error#%{LintStatus()}
 set statusline+=%*\ %P
 
 function! LintStatus() " it is overrided in ftplugins
@@ -108,7 +106,7 @@ autocmd BufEnter * let &titlestring = expand("%:t")
 " }}}
 
 " Fugitive {{{
-nmap <F7> "cyiw:execute "Gvsplit " . @c<CR>zR
+nmap <F7> :Gvsplit <C-R><C-W><CR>zR
 nmap <F9> :diffupdate<CR>:syntax off<CR>:syntax on<CR>
 " }}}