From 3453b0d473a71efa792cae9946eb97e32528ac7a Mon Sep 17 00:00:00 2001
From: Kien N <contact@ndkien.com>
Date: Thu, 9 Feb 2012 20:58:11 +0700
Subject: [PATCH] Fix console dialogs being hidden

Close #136
---
 autoload/ctrlp.vim          | 14 ++++++--------
 autoload/ctrlp/quickfix.vim |  2 +-
 autoload/ctrlp/tag.vim      |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/autoload/ctrlp.vim b/autoload/ctrlp.vim
index 8f81bc9..c71edcb 100644
--- a/autoload/ctrlp.vim
+++ b/autoload/ctrlp.vim
@@ -334,7 +334,7 @@ fu! s:MatchedItems(items, pat, limit)
 	retu newitems
 endf
 fu! s:SplitPattern(str) "{{{1
-	let str = s:sanstail(a:str)
+	let str = a:str
 	if s:migemo && s:regexp && len(str) > 0 && executable('cmigemo')
 		let str = s:migemo(str)
 	en
@@ -402,16 +402,14 @@ endf
 fu! s:Update(str)
 	" Get the previous string if existed
 	let oldstr = exists('s:savestr') ? s:savestr : ''
-	let pat = s:SplitPattern(a:str)
 	" Get the new string sans tail
-	let notail = substitute(a:str, '\\\\', '\', 'g')
-	let notail = substitute(notail, '\\\@<!:\([^:]\|\\:\)*$', '', '')
-	let notail = substitute(notail, '\\\ze:', '', 'g')
+	let str = s:sanstail(a:str)
 	" Stop if the string's unchanged
-	if notail == oldstr && !empty(notail) && !exists('s:force')
+	if str == oldstr && !empty(str) && !exists('s:force')
 		retu
 	en
-	let lines = exists('g:ctrlp_nolimit') && empty(notail) ? copy(g:ctrlp_lines)
+	let pat = s:SplitPattern(str)
+	let lines = exists('g:ctrlp_nolimit') && empty(str) ? copy(g:ctrlp_lines)
 		\ : s:MatchedItems(g:ctrlp_lines, pat, s:mxheight)
 	cal s:Render(lines, pat)
 endf
@@ -1365,7 +1363,7 @@ fu! s:openfile(cmd, filpath, ...)
 	let cmd = a:cmd =~ '^[eb]$' && &modified ? 'hid '.a:cmd : a:cmd
 	let cmd = cmd =~ '^tab' ? tabpagenr('$').cmd : cmd
 	let tail = a:0 ? a:1 : s:tail()
-	sil! exe cmd.tail.' '.ctrlp#fnesc(a:filpath)
+	exe cmd.tail.' '.ctrlp#fnesc(a:filpath)
 	if !empty(tail)
 		sil! norm! zvzz
 	en
diff --git a/autoload/ctrlp/quickfix.vim b/autoload/ctrlp/quickfix.vim
index 51e2bdd..02d697c 100644
--- a/autoload/ctrlp/quickfix.vim
+++ b/autoload/ctrlp/quickfix.vim
@@ -45,7 +45,7 @@ fu! ctrlp#quickfix#accept(mode, str)
 	let cmd = md == 't' ? 'tabe' : md == 'h' ? 'new' : md == 'v' ? 'vne'
 		\ : ctrlp#normcmd('e')
 	let cmd = cmd == 'e' && &modified ? 'hid e' : cmd
-	sil! exe cmd.' '.ctrlp#fnesc(filpath)
+	exe cmd.' '.ctrlp#fnesc(filpath)
 	cal cursor(items[2], items[3]) | sil! norm! zvzz
 endf
 
diff --git a/autoload/ctrlp/tag.vim b/autoload/ctrlp/tag.vim
index e969089..8c6890e 100644
--- a/autoload/ctrlp/tag.vim
+++ b/autoload/ctrlp/tag.vim
@@ -97,9 +97,9 @@ fu! ctrlp#tag#accept(mode, str)
 		if cmd != ''
 			sil! exe cmd
 		en
-		sil! exe fnd[1].'ta' tg
+		exe fnd[1].'ta' tg
 	el
-		sil! exe cmd.' '.tg
+		exe cmd.' '.tg
 	en
 endf