From e41418d55c2f3167687f0e4fc98abc21269c04f5 Mon Sep 17 00:00:00 2001 From: Vasili Sviridov Date: Thu, 20 Oct 2011 13:44:21 -0700 Subject: [PATCH 1/2] Added some bundles --- .gitmodules | 6 ++++++ bundle/snipmate | 1 + bundle/surround | 1 + 3 files changed, 8 insertions(+) create mode 160000 bundle/snipmate create mode 160000 bundle/surround diff --git a/.gitmodules b/.gitmodules index 6db0e57..105d14b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "bundle/fugitive"] path = bundle/fugitive url = git://github.com/tpope/vim-fugitive.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 diff --git a/bundle/snipmate b/bundle/snipmate new file mode 160000 index 0000000..f5a75d0 --- /dev/null +++ b/bundle/snipmate @@ -0,0 +1 @@ +Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b diff --git a/bundle/surround b/bundle/surround new file mode 160000 index 0000000..6f0984a --- /dev/null +++ b/bundle/surround @@ -0,0 +1 @@ +Subproject commit 6f0984a5ca1430047fe760fc680c6cf98ae94b01 From 4ebca2259415bee53b2f86703d99ade8adf46422 Mon Sep 17 00:00:00 2001 From: Vasili Sviridov Date: Thu, 20 Oct 2011 22:06:38 -0700 Subject: [PATCH 2/2] Automatic cancellation of insert mode --- vimrc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vimrc b/vimrc index ec60e5e..d31a8e5 100644 --- a/vimrc +++ b/vimrc @@ -30,6 +30,10 @@ nnoremap k gk imap jj "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