From 184a2e22c2e5054c9b85c6558d4b2e03b07eaec7 Mon Sep 17 00:00:00 2001
From: yan <yan@pritzker.ws>
Date: Thu, 7 Jun 2012 13:25:12 -0500
Subject: [PATCH] Make ctrlp play nice with vim-ruby-conque by closing its
 window

---
 vim/bundle/skwp-vim-ruby-conque |  2 +-
 vim/plugin/settings/ctrlp.vim   | 35 ++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/vim/bundle/skwp-vim-ruby-conque b/vim/bundle/skwp-vim-ruby-conque
index b1fdf8c..3657478 160000
--- a/vim/bundle/skwp-vim-ruby-conque
+++ b/vim/bundle/skwp-vim-ruby-conque
@@ -1 +1 @@
-Subproject commit b1fdf8c456469468e6bf64e829faf50b102a7274
+Subproject commit 36574785ccad4cd887c4e20b187bd23de966995c
diff --git a/vim/plugin/settings/ctrlp.vim b/vim/plugin/settings/ctrlp.vim
index 6d588c7..1282541 100644
--- a/vim/plugin/settings/ctrlp.vim
+++ b/vim/plugin/settings/ctrlp.vim
@@ -9,32 +9,31 @@ let g:ctrlp_by_filename = 1
 let g:ctrlp_map = ',t'
 
 " Additional mapping for buffer search
-nnoremap ,b :CtrlPBuffer<cr>
-nnoremap <C-b> :CtrlPBuffer<cr>
+nnoremap ,b :CloseSingleConque<CR>:CtrlPBuffer<cr>
+nnoremap <C-b> :CloseSingleConque<CR>:CtrlPBuffer<cr>
 
 " Cmd-Shift-P to clear the cache
 nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
 
-
 " Idea from : http://www.charlietanksley.net/blog/blog/2011/10/18/vim-navigation-with-lustyexplorer-and-lustyjuggler/
 " Open CtrlP starting from a particular path, making it much
 " more likely to find the correct thing first. mnemonic 'jump to [something]'
-map ,jm :CtrlP app/models<CR>
-map ,jc :CtrlP app/controllers<CR>
-map ,jv :CtrlP app/views<CR>
-map ,jh :CtrlP app/helpers<CR>
-map ,jl :CtrlP lib<CR>
-map ,jp :CtrlP public<CR>
-map ,js :CtrlP spec<CR>
-map ,jf :CtrlP fast_spec<CR>
-map ,jd :CtrlP db<CR>
-map ,jC :CtrlP config<CR>
-map ,jV :CtrlP vendor<CR>
-map ,jF :CtrlP factories<CR>
-map ,jT :CtrlP test<CR>
+map ,jm :CloseSingleConque<CR>:CtrlP app/models<CR>
+map ,jc :CloseSingleConque<CR>:CtrlP app/controllers<CR>
+map ,jv :CloseSingleConque<CR>:CtrlP app/views<CR>
+map ,jh :CloseSingleConque<CR>:CtrlP app/helpers<CR>
+map ,jl :CloseSingleConque<CR>:CtrlP lib<CR>
+map ,jp :CloseSingleConque<CR>:CtrlP public<CR>
+map ,js :CloseSingleConque<CR>:CtrlP spec<CR>
+map ,jf :CloseSingleConque<CR>:CtrlP fast_spec<CR>
+map ,jd :CloseSingleConque<CR>:CtrlP db<CR>
+map ,jC :CloseSingleConque<CR>:CtrlP config<CR>
+map ,jV :CloseSingleConque<CR>:CtrlP vendor<CR>
+map ,jF :CloseSingleConque<CR>:CtrlP factories<CR>
+map ,jT :CloseSingleConque<CR>:CtrlP test<CR>
 
 "Cmd-(m)ethod - jump to a method (tag in current file)
-map ,m :CtrlPBufTag<CR>
+map ,m :CloseSingleConque<CR>:CtrlPBufTag<CR>
 
 "Ctrl-(M)ethod - jump to a method (tag in all files)
-map ,M :CtrlPBufTagAll<CR>
+map ,M :CloseSingleConque<CR>:CtrlPBufTagAll<CR>