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=6ae6e24d7da380ecbf243c8e3c4ce627e1793e50;hpb=ad7fceab5f5404f8e4071f8ce23c839433fee4ac;p=cmccabe-etc

diff --git a/.vim/indent/cpp.vim b/.vim/indent/cpp.vim
index 6ae6e24..1cad309 100644
--- a/.vim/indent/cpp.vim
+++ b/.vim/indent/cpp.vim
@@ -5,7 +5,7 @@ endif
 source $VIMRUNTIME/indent/cpp.vim
 let b:did_indent = 1
 
-" Linux kernel style indentation
+" Hadoop style indentation
 set sw=2
 set ts=2
 set et
@@ -13,4 +13,7 @@ set et
 " 80 column limit
 set tw=80
 
-set cinoptions=:0,l1,t0,g0,(0   " C-Indent options: Linux-kernel style
+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://