From a6b9f3e9ef6ee827d42c0567d1cd5e566e863402 Mon Sep 17 00:00:00 2001 From: yan Date: Wed, 30 May 2012 01:34:34 -0700 Subject: [PATCH] Merged spec finder and conque spec runner into one plugin --- .gitmodules | 3 --- vim/bundle/skwp-vim-ruby-conque | 2 +- vim/bundle/skwp-vim-spec-finder | 1 - vim/plugin/settings/conqueterm.vim | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) delete mode 160000 vim/bundle/skwp-vim-spec-finder diff --git a/.gitmodules b/.gitmodules index 9048abd..212b0c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -301,9 +301,6 @@ [submodule "zsh/zsh-syntax-highlighting"] path = zsh/zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule "vim/bundle/skwp-vim-spec-finder"] - path = vim/bundle/skwp-vim-spec-finder - url = https://github.com/skwp/vim-spec-finder [submodule "vim/bundle/tpope-vim-bundler"] path = vim/bundle/tpope-vim-bundler url = https://github.com/tpope/vim-bundler diff --git a/vim/bundle/skwp-vim-ruby-conque b/vim/bundle/skwp-vim-ruby-conque index faa10ea..ff1e84b 160000 --- a/vim/bundle/skwp-vim-ruby-conque +++ b/vim/bundle/skwp-vim-ruby-conque @@ -1 +1 @@ -Subproject commit faa10ea4d9f6f11cc29841b007748b5365c45c5e +Subproject commit ff1e84bf89cfd214303d9815f8688bc892cc648d diff --git a/vim/bundle/skwp-vim-spec-finder b/vim/bundle/skwp-vim-spec-finder deleted file mode 160000 index b90f4a6..0000000 --- a/vim/bundle/skwp-vim-spec-finder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b90f4a669d09986156ef770800d1c37df4f84e11 diff --git a/vim/plugin/settings/conqueterm.vim b/vim/plugin/settings/conqueterm.vim index 63be7b4..3146268 100644 --- a/vim/plugin/settings/conqueterm.vim +++ b/vim/plugin/settings/conqueterm.vim @@ -1,4 +1,4 @@ -let g:ConqueTerm_InsertOnEnter = 1 +let g:ConqueTerm_InsertOnEnter = 0 let g:ConqueTerm_CWInsert = 1 let g:ConqueTerm_Color = 2 let g:ConqueTerm_ReadUnfocused = 1 " update conqueterm buffer while we're not looking (for running tests)