diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2017-09-30 22:13:43 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2017-09-30 22:13:43 +0900 |
| commit | c2614467cf79dcfaca58da30df70d4e6dc6b3792 (patch) | |
| tree | 03a3d66bc56e1ed3e5fce7002a5516ac2873fde4 /plugin | |
| parent | 077ae51f0511260ba2d2c793b776582d41fefd6a (diff) | |
[neovim] Fix Neovim plugin to use terminal instead of --height
Close #1066
Close #1068
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/fzf.vim | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim index bf80cfbd..bad7255a 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -389,8 +389,10 @@ try 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') - let has_term = has('nvim-0.2.1') || has('nvim') && !s:is_win || has('terminal') && has('patch-8.0.995') - let use_term = has_term && (has('gui_running') || s:is_win || !use_height && s:present(dict, 'down', 'up', 'left', 'right', 'window')) + 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('gui_running') || s:is_win || !use_height && s:present(dict, 'down', 'up', 'left', 'right', 'window')) let use_tmux = (!use_height && !use_term || prefer_tmux) && !has('win32unix') && s:tmux_enabled() && s:splittable(dict) if prefer_tmux && use_tmux let use_height = 0 |