vim: these are being set in ftplugin

diff --git a/vim/indent/cpp.vim b/vim/indent/cpp.vim
index d764fa43b76b6a524db87d8ebc9ea12e69e83530..87f2adb79f2933bcbbed9276c6b943f70e0bdd7b 100644 (file)
--- a/vim/indent/cpp.vim
+++ b/vim/indent/cpp.vim
@@ -55,15 +55,6 @@ function! GoogleCppIndent()
     return l:orig_indent
 endfunction
 
-setlocal shiftwidth=4
-setlocal tabstop=4
-setlocal softtabstop=4
-setlocal expandtab
-setlocal textwidth=80
-
-setlocal cindent
-setlocal cinoptions=l1,g0,t0,i4,+4,(0,w1,W4
-
 setlocal indentexpr=GoogleCppIndent()
 
 let b:undo_indent = "setl sw< ts< sts< et< tw< wrap< cin< cino< inde<"