Skip to content

Commit 8db39ec

Browse files
authored
Merge pull request #402 from ctrlpvim/no-percent-cmd
Possible to be specify g:ctrlp_user_command without %s
2 parents bde7a29 + ceed7c5 commit 8db39ec

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

autoload/ctrlp.vim

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,14 @@ fu! ctrlp#addfile(ch, file)
439439
cal s:BuildPrompt(1)
440440
endf
441441

442+
fu! s:safe_printf(format, ...)
443+
try
444+
retu call('printf', [a:format] + a:000)
445+
cat
446+
retu a:format
447+
endt
448+
endf
449+
442450
fu! s:UserCmd(lscmd)
443451
let [path, lscmd] = [s:dyncwd, a:lscmd]
444452
let do_ign =
@@ -461,9 +469,9 @@ fu! s:UserCmd(lscmd)
461469
let g:ctrlp_allfiles = []
462470
let s:job = job_start([&shell, &shellcmdflag, printf(lscmd, path)], {'callback': 'ctrlp#addfile'})
463471
elsei has('patch-7.4-597') && !(has('win32') || has('win64'))
464-
let g:ctrlp_allfiles = systemlist(printf(lscmd, path))
472+
let g:ctrlp_allfiles = systemlist(s:safe_printf(lscmd, path))
465473
el
466-
let g:ctrlp_allfiles = split(system(printf(lscmd, path)), "\n")
474+
let g:ctrlp_allfiles = split(system(s:safe_printf(lscmd, path)), "\n")
467475
en
468476
if exists('+ssl') && exists('ssl')
469477
let &ssl = ssl

0 commit comments

Comments
 (0)