X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.vim%2Findent%2Fcpp.vim;h=1cad3096ecbf28e154a4c165308cb3bc155fd8e0;hb=b9944181e5b6a7e2efcbdf6378025982b1c038df;hp=04e779b9443d42bb8f8c06e3b97ef8d82d113b14;hpb=0e9c07aad8cbacf0502ff619594c7b453a83dc6d;p=cmccabe-etc

diff --git a/.vim/indent/cpp.vim b/.vim/indent/cpp.vim
index 04e779b..1cad309 100644
--- a/.vim/indent/cpp.vim
+++ b/.vim/indent/cpp.vim
@@ -5,19 +5,15 @@ endif
 source $VIMRUNTIME/indent/cpp.vim
 let b:did_indent = 1
 
-" ceph style tabs
-set tabstop=8
-set softtabstop=2
-set shiftwidth=2
-set noexpandtab
+" Hadoop style indentation
+set sw=2
+set ts=2
+set et
 
-" Traditional cpp four-space indentation
-"set sw=4
-"set ts=4
-"set et
+" 80 column limit
+set tw=80
 
-" 100 column limit
-set tw=100
-
-set cinoptions+=g2h2:2=2t0(0
+set cinoptions=:0,L1,l1,t0,g0,(0
 
+" We want to continue C++-style doxygen comments (i.e., the ///)
+set comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,bO:///,O://