From 269a3f1350879406360f476d5e5219a35ea9c8c6 Mon Sep 17 00:00:00 2001 From: Kien N Date: Sat, 21 Apr 2012 13:03:36 +0700 Subject: [PATCH] Only when using globpath() --- autoload/ctrlp.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/ctrlp.vim b/autoload/ctrlp.vim index d2ef989..de8c10b 100644 --- a/autoload/ctrlp.vim +++ b/autoload/ctrlp.vim @@ -302,7 +302,7 @@ fu! s:GlobPath(dirs, depth) let [dnf, depth] = [ctrlp#dirnfile(entries), a:depth + 1] cal extend(g:ctrlp_allfiles, dnf[1]) if !empty(dnf[0]) && !s:maxf(len(g:ctrlp_allfiles)) && depth <= s:maxdepth - sil! cal ctrlp#progress(len(g:ctrlp_allfiles)) + sil! cal ctrlp#progress(len(g:ctrlp_allfiles), 1) cal s:GlobPath(join(dnf[0], ','), depth) en endf @@ -1116,11 +1116,11 @@ fu! s:dismrk() \ '%<'.join(values(map(copy(s:marked), 'split(v:val, "[\\/]")[-1]')), ', ') endf -fu! ctrlp#progress(enum) +fu! ctrlp#progress(enum, ...) if has('macunix') || has('mac') | sl 1m | en - let txt = ' (press ctrl-c to abort)' + let txt = a:0 ? '(press ctrl-c to abort)' : '' let &l:stl = s:status != {} ? call(s:status['prog'], [a:enum]) - \ : '%#CtrlPStats# '.a:enum.' %*'.txt.'%=%<%#CtrlPMode2# '.s:dyncwd.' %*' + \ : '%#CtrlPStats# '.a:enum.' %* '.txt.'%=%<%#CtrlPMode2# '.s:dyncwd.' %*' redraws endf " Paths {{{2