|
|
|
@ -419,6 +419,9 @@ function! fzf#wrap(...)
|
|
|
|
|
call remove(opts, key)
|
|
|
|
|
endif
|
|
|
|
|
endfor
|
|
|
|
|
if exists('g:fzf_fullscreen_layout')
|
|
|
|
|
let opts = extend(opts, s:validate_layout(get(g:, 'fzf_fullscreen_layout', {})))
|
|
|
|
|
endif
|
|
|
|
|
elseif !s:has_any(opts, s:layout_keys)
|
|
|
|
|
if !exists('g:fzf_layout') && exists('g:fzf_height')
|
|
|
|
|
let opts.down = g:fzf_height
|
|
|
|
@ -539,7 +542,7 @@ try
|
|
|
|
|
let has_vim8_term = has('terminal') && has('patch-8.0.995')
|
|
|
|
|
let has_nvim_term = has('nvim-0.2.1') || has('nvim') && !s:is_win
|
|
|
|
|
let use_term = has_nvim_term ||
|
|
|
|
|
\ has_vim8_term && !has('win32unix') && (has('gui_running') || s:is_win || s:present(dict, 'down', 'up', 'left', 'right', 'window'))
|
|
|
|
|
\ has_vim8_term && !has('win32unix') && (has('gui_running') || s:is_win || s:present(dict, 'up', 'left', 'right', 'window'))
|
|
|
|
|
let use_tmux = (has_key(dict, 'tmux') || (!use_height && !use_term || prefer_tmux) && !has('win32unix') && s:splittable(dict)) && s:tmux_enabled()
|
|
|
|
|
if prefer_tmux && use_tmux
|
|
|
|
|
let use_height = 0
|
|
|
|
|