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

diff --git a/vimrc b/vimrc
index 7127c78..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.
@@ -92,9 +92,9 @@ set complete-=k complete+=k
 set tags=tags;/,.tags;/,TAGS;/
 
 set cinoptions=
-set cinoptions+=L0.5s          " align labels at 0.5 shiftwidth
-set cinoptions+=:0.5s,=0.5s    " same for case labels and code following a label
-set cinoptions+=g0.5s,h0.5s    " same for c++ stuff
+set cinoptions+=Ls           " align labels at 0 shiftwidth
+set cinoptions+=:0,=1s    " same for case labels
+"set cinoptions+=g0.5s,h0.5s   " same for c++ stuff
 set cinoptions+=t0             " type on the line before the functions is not idented
 set cinoptions+=(0,Ws          " indent in functions ( ... ) when it breaks
 set cinoptions+=m1             " aligh the closing ) properly
@@ -104,9 +104,6 @@ set cinoptions+=j1             " java/javscript -> fixes blocks
 set diffopt=filler,context:5,iwhite
 set fillchars+=diff:\ ,vert:│
 
-set makeprg=LC_ALL=C\ make\ MONOCHROME=1
-set grepprg=egrep\ --exclude='*.blk.c'\ --exclude='*.blkk.cc'\ -n\ $*\ /dev/null
-
 exe "set path=." . system("echo | cpp -v 2>&1 | grep '^ .*/include' | tr -d \"\n\" | tr \" \" \",\"")
 set path+=.;/
 
@@ -143,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('.')
@@ -223,12 +224,13 @@ if has("autocmd")
 
     au FileType debchangelog normal zO
 
+    au FileType asciidoc setlocal tw=78 noet ts=8 sw=8
     au FileType javascript setlocal cindent tw=78 iskeyword+=$
     au FileType actionscript setlocal cindent tw=78 iskeyword+=$ noignorecase ff=dos
     au FileType mail setlocal noet iskeyword+=- tw=72
 
     au FileType haxe setlocal tw=78 noignorecase cin ai
-    au FileType c,cpp setlocal tw=78 noignorecase "fo-=ro
+    au FileType d,c,cpp setlocal tw=78 noignorecase "fo-=ro
     au FileType ocaml,acute,omlet setlocal sw=2 sts=2 tw=78
     au FileType php  setlocal et fo+=ro tw=78 indentexpr= cin
     au FileType python setlocal foldmethod=indent foldnestmax=1
@@ -438,6 +440,8 @@ if has("gui_running") || &t_Co >= 88
     SynLink doxygenSpecialHeading          doxygenBrief
     SynLink doxygenParamDirection          doxygenSpecial
 
+    exec <SID>myhi("javaScriptTpl",    "none",       "7fcf7f",    "none")
+    exec <SID>myhi("javaScriptTplMark","none",       "b218b2",    "none")
     exec <SID>myhi("doxygenComment",   "none",       "6060ff",    "0f0f0f")
     exec <SID>myhi("doxygenBrief",     "none",       "6060ff",    "0f0f0f")
     exec <SID>myhi("doxygenPrev",      "none",       "6060ff",    "0f0f0f")
@@ -474,4 +478,13 @@ endif
 hi def link htmlTag htmlStatement
 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