From 07a03b3e739e146182062b1b7f84507569cfdbec Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 20 Jun 2020 22:12:50 +0900 Subject: [vim] Make fzf#wrap support v:true and v:false as well Fix #2087 --- plugin/fzf.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugin/fzf.vim') diff --git a/plugin/fzf.vim b/plugin/fzf.vim index 06ef99ad..e3a11179 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -297,7 +297,7 @@ function! fzf#wrap(...) let expects = map(copy(args), 'type(v:val)') let tidx = 0 for arg in copy(a:000) - let tidx = index(expects, type(arg), tidx) + let tidx = index(expects, type(arg) == 6 ? type(0) : type(arg), tidx) if tidx < 0 throw 'Invalid arguments (expected: [name string] [opts dict] [fullscreen boolean])' endif -- cgit v1.2.3 From 3e36f2b0acbb0632e6d74199e6619945f2cc016d Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 20 Jun 2020 21:34:43 -0400 Subject: [nvim] Fix floating window requirements (#2089) Vim 8.1.2371 https://github.com/vim/vim/commit/05ad5ff0ab34ed9a5296dedd420ca81698b8ce22 Nvim 0.4.0 https://github.com/neovim/neovim/commit/9a1675b065394734ddaef91a314896028e2b1d46 --- plugin/fzf.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugin/fzf.vim') diff --git a/plugin/fzf.vim b/plugin/fzf.vim index e3a11179..fc45c797 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -652,8 +652,8 @@ function! s:split(dict) try if s:present(a:dict, 'window') if type(a:dict.window) == type({}) - if !has('nvim') && !has('patch-8.2.191') - throw 'Vim 8.2.191 or later is required for pop-up window' + if !(has('nvim') ? has('nvim-0.4') : has('popupwin') && has('patch-8.2.191')) + throw 'Nvim 0.4+ or Vim 8.2.191+ with popupwin feature is required for pop-up window' end call s:popup(a:dict.window) let is_popup = 1 -- cgit v1.2.3