X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.vim%2Findent%2Fcpp.vim;h=bf5fbb00e91e46213ab8d11dfeecde65549416f7;hb=69a7b03b708b71feb1743cfeaa635d7443522e43;hp=cb805670a01a7ccc0cba2f971afb819aa5edbb2e;hpb=d809e7e07429d8a47e22fefa696217d5ef7cc1cc;p=cmccabe-etc

diff --git a/.vim/indent/cpp.vim b/.vim/indent/cpp.vim
index cb80567..bf5fbb0 100644
--- a/.vim/indent/cpp.vim
+++ b/.vim/indent/cpp.vim
@@ -5,12 +5,15 @@ endif
 source $VIMRUNTIME/indent/cpp.vim
 let b:did_indent = 1
 
-" Linux kernel style indentation
-set sw=8
-set ts=8
-set noet
+" Hadoop style indentation
+set sw=2
+set ts=2
+set et
 
 " 80 column limit
 set tw=80
 
 set cinoptions=:0,l1,t0,g0,(0   " C-Indent options: Linux-kernel style
+
+" We want to continue C++-style doxygen comments (i.e., the ///)
+set comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,bO:///,O://