stonewareslord/fzf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prefer pre-existing function/alias in Vim plugin

Browse Source
This commit is contained in:
Junegunn Choi 2014-03-25 12:05:51 +09:00
parent 678e950b6d
commit b8e438b6be
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/fzf.vim
View File

@ -21,7 +21,18 @@
" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION " OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. " WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
let s:exec = expand('<sfile>:h:h').'/fzf' call system('type fzf')
if v:shell_error
let s:fzf_rb = expand('<sfile>:h:h').'/fzf'
if executable(s:fzf_rb)
let s:exec = s:fzf_rb
else
echoerr 'fzf executable not found'
finish
endif
else
let s:exec = 'fzf'
endif
function! s:escape(path) function! s:escape(path)
return substitute(a:path, ' ', '\\ ', 'g') return substitute(a:path, ' ', '\\ ', 'g')
@ -38,9 +49,8 @@ function! fzf#run(command, ...)
let argstr = join(args) let argstr = join(args)
let tf = tempname() let tf = tempname()
let prefix = exists('g:fzf_source') ? g:fzf_source.'|' : '' let prefix = exists('g:fzf_source') ? g:fzf_source.'|' : ''
let fzf = executable(s:exec) ? s:exec : 'fzf'
let options = empty(argstr) ? get(g:, 'fzf_options', '') : argstr let options = empty(argstr) ? get(g:, 'fzf_options', '') : argstr
execute "silent !".prefix.fzf.' '.options." > ".tf execute 'silent !'.prefix.s:exec.' '.options.' > '.tf
if !v:shell_error if !v:shell_error
for line in readfile(tf) for line in readfile(tf)
if !empty(line) if !empty(line)