X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=vimrc;h=636b68aefafef55e5057924db8035ad841bdb784;hb=HEAD;hp=61c93a38f0b68361a996c579352946a7a4d322d3;hpb=d55a1c24af98dc51263bc04f9d08ce2bcfd5722b;p=~madcoder%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 61c93a3..636b68a 100644
--- a/vimrc
+++ b/vimrc
@@ -34,7 +34,7 @@ set report=0                    " show a report when N lines were changed.
 
 set laststatus=2                " show status line?  Yes, always!
 set noruler                       " show cursor position?  Yep!
-set statusline=[\ %f%m\ %r%y\ %=\ hex:%B\ \ %l,%c%V\ \ %P\ ]
+set statusline=[\ %f%m\ %r%y\ %{fugitive#statusline()}\ %=\ hex:%B\ \ %l,%c%V\ \ %P\ ]
 
 set shiftwidth=4                " Number of spaces to use for each insertion of
                                 " (auto)indent.
@@ -140,8 +140,12 @@ map <C-W>g :bo cw 8<cr>
 " {{{ Mappings
 
 " {{{ Tab Key magic ...
-vmap <tab> >gv
-vmap <bs> <gv
+vnoremap <tab> >gv
+xnoremap <tab> >gv
+snoremap <tab> >gv
+vnoremap <bs> <gv
+xnoremap <bs> <gv
+snoremap <bs> <gv
 
 function! TabAlign()
     let col  = col('.')
@@ -476,3 +480,11 @@ hi def link htmlEndTag htmlStatement
 
 ia <buffer> sabine Sabine
 " }}}
+
+call pathogen#infect()
+let g:clang_complete_copen=1
+let g:clang_snippets=1
+let g:clang_complete_patterns=1
+let g:clang_snippets_engine = 'clang_complete'
+set completeopt=menu,longest
+set concealcursor=inv