Merged master config

2011-10-20 22:08:47 -07:00
parent 0c7ff35842 4ebca22594
commit b981d5193c
4 changed files with 15 additions and 3 deletions
@@ -4,3 +4,9 @@
 [submodule "bundle/vim-erlang"]
 	path = bundle/vim-erlang
 	url = git://github.com/jimenezrick/vimerl.git
+[submodule "bundle/surround"]
+	path = bundle/surround
+	url = git://github.com/tpope/vim-surround.git
+[submodule "bundle/snipmate"]
+	path = bundle/snipmate
+	url = git://github.com/msanders/snipmate.vim.git
@@ -30,6 +30,10 @@ nnoremap k gk
 imap jj <Esc>

 "Autoexit to normal mode
-au CursorHoldI * stopinsert
-au InsertEnter * let updaterestore=&updatetime | set updatetime=15000
-au InsertLeave * let &updatetime=updaterestore
+if has("autocmd")
+	au CursorHoldI * stopinsert
+	au InsertEnter * let updaterestore=&updatetime | set updatetime=15000
+	au InsertLeave * let &updatetime=updaterestore
+endif
+
+set autoread		"automatically reload files