Use expand() on cache_dir

* Continue #32
kien · Nov 14, 2011 · 9f255ab · 9f255ab
1 parent 9da5b08
commit 9f255ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/autoload/ctrlp.vim b/autoload/ctrlp.vim
@@ -787,6 +787,7 @@ fu! s:comparent(s1, s2)
 		let [loc1, loc2] = [s:getparent(as1), s:getparent(as2)]
 		if loc1 == s:crfpath && loc2 != s:crfpath | retu -1 | en
 		if loc2 == s:crfpath && loc1 != s:crfpath | retu 1  | en
+		retu 0
 	en
 	retu 0
 endf
@@ -1180,7 +1181,7 @@ fu! s:walker(max, pos, dir)
 endf
 
 fu! s:matchsubstr(item, pat)
-	retu match(split(a:item, '[\/]\ze[^\/:]\+$')[-1], a:pat)
+	retu match(split(a:item, '[\/]\ze[^\/]\+$')[-1], a:pat)
 endf
 
 fu! s:maxfiles(len)

diff --git a/autoload/ctrlp/utils.vim b/autoload/ctrlp/utils.vim
@@ -11,10 +11,11 @@ endf
 let s:lash = ctrlp#utils#lash()
 
 fu! ctrlp#utils#opts()
-	let s:cache_dir = exists('g:ctrlp_cache_dir') ?
+	let cache_dir = exists('g:ctrlp_cache_dir') ?
 		\ isdirectory(g:ctrlp_cache_dir.s:lash.'.ctrlp_cache')
 		\ ? g:ctrlp_cache_dir.s:lash.'.ctrlp_cache'
 		\ : g:ctrlp_cache_dir : $HOME.s:lash.'.ctrlp_cache'
+	let s:cache_dir = expand(cache_dir, 1)
 endf
 cal ctrlp#utils#opts()
 "}}}