Merge branch 'master' into wsr
This commit is contained in:
commit
2be2dbcf7c
1
.vimrc
1
.vimrc
|
@ -1,6 +1,7 @@
|
||||||
set ai
|
set ai
|
||||||
" Disable (ab)use of X11 selection
|
" Disable (ab)use of X11 selection
|
||||||
set clipboard=
|
set clipboard=
|
||||||
|
set colorcolumn=72,80,100,132
|
||||||
set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
|
set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
|
||||||
set expandtab
|
set expandtab
|
||||||
set exrc
|
set exrc
|
||||||
|
|
Loading…
Reference in New Issue