projects
/
~madcoder
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed files
[~madcoder/dotfiles.git]
/
vimrc
diff --git
a/vimrc
b/vimrc
index
ffd0d5f
..
636b68a
100644
(file)
--- 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 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.
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 tags=tags;/,.tags;/,TAGS;/
set cinoptions=
-set cinoptions+=L
0.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+=L
s " 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
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 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+=.;/
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 ...
" {{{ 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('.')
function! TabAlign()
let col = col('.')
@@
-479,3
+480,11
@@
hi def link htmlEndTag htmlStatement
ia <buffer> sabine Sabine
" }}}
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