diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2016-08-28 19:18:13 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2016-08-28 19:18:13 +0900 |
| commit | 411ec2e55773038ff3522a3f52cfde4b89b0df5c (patch) | |
| tree | bca5b6a96a1472a57c68cdd320ddb2d74e0fc8e5 /plugin | |
| parent | f958c9daf59439240c36d74f42187333c23bd8a4 (diff) | |
| parent | f025602841384fb10cc80d37492ec44c2b872860 (diff) | |
| download | fzf-411ec2e55773038ff3522a3f52cfde4b89b0df5c.tar.gz | |
Merge branch 'joshuarubin-master'
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/fzf.vim | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim index abaa420c..4b554e92 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -431,9 +431,11 @@ function! s:split(dict) endfunction function! s:execute_term(dict, command, temps) abort + let winrest = winrestcmd() let [ppos, winopts] = s:split(a:dict) let fzf = { 'buf': bufnr('%'), 'ppos': ppos, 'dict': a:dict, 'temps': a:temps, - \ 'winopts': winopts, 'command': a:command } + \ 'winopts': winopts, 'winrest': winrest, 'lines': &lines, + \ 'columns': &columns, 'command': a:command } function! fzf.switch_back(inplace) if a:inplace && bufnr('') == self.buf " FIXME: Can't re-enter normal mode from terminal mode @@ -465,6 +467,10 @@ function! s:execute_term(dict, command, temps) abort execute 'bd!' self.buf endif + if &lines <= self.lines && &columns <= self.columns && s:getpos() == self.ppos + execute self.winrest + endif + if !s:exit_handler(a:code, self.command, 1) return endif |