X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.vim%2Findent%2Fcpp.vim;h=cb805670a01a7ccc0cba2f971afb819aa5edbb2e;hb=42932fb937f188f27e5e46ad1940c665dae29b19;hp=2a6a7f112144e81cb6e0e5b8e5acfd88c0e20ff6;hpb=76ce8991a20c8107f107bc6d0ca06b44499de73f;p=cmccabe-etc

diff --git a/.vim/indent/cpp.vim b/.vim/indent/cpp.vim
index 2a6a7f1..cb80567 100644
--- a/.vim/indent/cpp.vim
+++ b/.vim/indent/cpp.vim
@@ -5,18 +5,12 @@ 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
+" Linux kernel style indentation
+set sw=8
+set ts=8
+set noet
 
-" 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,t0,g0,(0   " C-Indent options: Linux-kernel style