diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2021-05-19 14:47:03 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2021-05-19 18:39:12 +0900 |
| commit | 85ae7459103c3aeef39383d8c8a4fbbdb9fb5f64 (patch) | |
| tree | d1cb6eb951fbc1330441eed166080f6472ef47be | |
| parent | 7411da8d5a37b94b2171920c82c0dafe6f9115b6 (diff) | |
[vim] Use terminal buffer on 'down' layout on regular Vim on terminal
When 'down' layout was used on regular Vim on terminal, fzf would open
below the editor using `--height` option. This was the only case where
terminal buffer was not used (the code was written when Vim didn't have
builtin terminal) and this exception has been a constant source of
confusion.
This commit makes fzf open in a terminal buffer even in that case.
| -rw-r--r-- | plugin/fzf.vim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim index e8a7b8b8..11159af6 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -487,17 +487,17 @@ 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 || !use_height && s:present(dict, 'down', 'up', 'left', 'right', 'window')) + \ has_vim8_term && !has('win32unix') && (has('gui_running') || s:is_win || s:present(dict, 'down', '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 let use_term = 0 endif - if use_height + if use_term + let optstr .= ' --no-height' + elseif use_height let height = s:calc_size(&lines, dict.down, dict) let optstr .= ' --height='.height - elseif use_term - let optstr .= ' --no-height' endif let optstr .= s:border_opt(get(dict, 'window', 0)) let prev_default_command = $FZF_DEFAULT_COMMAND |