* Fix wording of the warning
* Add autoindent, smartindent, and smarttab options to the file


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21905 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/vim/vimrc b/utils/vim/vimrc
index 6efd59c..3c872d9 100644
--- a/utils/vim/vimrc
+++ b/utils/vim/vimrc
@@ -2,8 +2,7 @@
 " Maintainer: LLVM Team, http://llvm.cs.uiuc.edu
 " Updated:    2005-04-24
 " WARNING:    Read before you source in all these commands and macros!  Some
-"             of them may change VIM behavior that you depend on and the
-"             settings here may depend on other settings that you may have.
+"             of them may change VIM behavior that you depend on.
 
 " Wrap text at 80 cols
 set textwidth=80
@@ -13,6 +12,13 @@
 set shiftwidth=2
 set expandtab
 
+" Optional
+" C/C++ programming helpers
+set autoindent
+set smartindent
+" Add and delete spaces in increments of `shiftwidth' for tabs
+set smarttab
+
 " Enable filetype detection
 filetype on