cpp.vim: continue C++-style doxygen comments

[cmccabe-etc] / .vim / indent / cpp.vim

diff --git a/.vim/indent/cpp.vim b/.vim/indent/cpp.vim
index 2a6a7f1..bf5fbb0 100644 (file)
--- a/.vim/indent/cpp.vim
+++ b/.vim/indent/cpp.vim
@@ -5,18 +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=:0,l1,t0,g0,(0   " C-Indent options: Linux-kernel style
 
-set cinoptions+=g2h2:2=2t0(0
+" We want to continue C++-style doxygen comments (i.e., the ///)
+set comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,bO:///,O://