mirror of
https://github.com/junegunn/fzf.vim.git
synced 2026-03-06 23:24:47 +08:00
Use s:conf for preview_bash and files_options (#1502)
Follow-up to 832a090870.
This commit is contained in:
@@ -51,7 +51,7 @@ function! s:bash()
|
|||||||
return s:bash
|
return s:bash
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let custom_bash = get(g:, 'fzf_preview_bash', '')
|
let custom_bash = s:conf('preview_bash', '')
|
||||||
let git_bash = 'C:\Program Files\Git\bin\bash.exe'
|
let git_bash = 'C:\Program Files\Git\bin\bash.exe'
|
||||||
let candidates = filter(s:is_win ? [custom_bash, 'bash', git_bash] : [custom_bash, 'bash'], 'len(v:val)')
|
let candidates = filter(s:is_win ? [custom_bash, 'bash', git_bash] : [custom_bash, 'bash'], 'len(v:val)')
|
||||||
|
|
||||||
@@ -433,7 +433,7 @@ function! fzf#vim#files(dir, ...)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
let args.options = ['-m', '--prompt', strwidth(dir) < &columns / 2 - 20 ? dir : '> ']
|
let args.options = ['-m', '--prompt', strwidth(dir) < &columns / 2 - 20 ? dir : '> ']
|
||||||
call s:merge_opts(args, get(g:, 'fzf_files_options', []))
|
call s:merge_opts(args, s:conf('files_options', []))
|
||||||
return s:fzf('files', args, a:000)
|
return s:fzf('files', args, a:000)
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user