diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2020-06-21 22:43:03 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2020-06-21 22:43:03 +0900 |
| commit | 199bc3f0ad3238251f4c5352a69e00367e0670a0 (patch) | |
| tree | 89ed7f7f47cdf73f163c2a8a885aaa7bb7545965 /plugin/fzf.vim | |
| parent | 17dd833925d31c5811bd465229e57d23c0772687 (diff) | |
| parent | 4ec144c969efa6df1cd4d00a5f73f7613dc962fe (diff) | |
| download | fzf-199bc3f0ad3238251f4c5352a69e00367e0670a0.tar.gz | |
Merge branch 'master' into devel
Diffstat (limited to 'plugin/fzf.vim')
| -rw-r--r-- | plugin/fzf.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim index 06ef99ad..fc45c797 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 @@ -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 |