Merge f79e84e368 into bcda25a513

2 weeks ago · df4998783f
parent bcda25a513 f79e84e368
commit df4998783f
1 changed files with 3 additions and 0 deletions
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@ -524,6 +524,7 @@ try
  endif

  let prefer_tmux = get(g:, 'fzf_prefer_tmux', 0) || has_key(dict, 'tmux')
+  let prefer_height = get(g:, 'fzf_prefer_height', 0)
  let use_height = has_key(dict, 'down') && !has('gui_running') &&
        \ !(has('nvim') || s:is_win || has('win32unix') || s:present(dict, 'up', 'left', 'right', 'window')) &&
        \ executable('tput') && filereadable('/dev/tty')
@ -535,6 +536,8 @@ try
  if prefer_tmux && use_tmux
    let use_height = 0
    let use_term = 0
+  elseif prefer_height && use_height
+    let use_term = 0
  endif
  if use_term
    let optstr .= ' --no-height'