Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-23 15:18:29 +00:00
Code Issues Projects Releases Wiki Activity

[vim] Call feedkeys only when the destination buffer is a terminal

Browse Source 
Fix #2352
Fix https://github.com/junegunn/fzf.vim/issues/1216

Close #2364
This commit is contained in:
Junegunn Choi 2021-02-21 23:57:33 +09:00
parent a367dfb22e
commit dea950c2c8
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/fzf.vim
View File

@ -764,10 +764,11 @@ function! s:split(dict)
endtry
endfunction
noremap <silent> <Plug>(fzf-normal) <Nop>
noremap! <silent> <Plug>(fzf-normal) <Nop>
nnoremap <silent> <Plug>(fzf-insert) i
nnoremap <silent> <Plug>(fzf-normal) <Nop>
if exists(':tnoremap')
tnoremap <silent> <expr> <Plug>(fzf-normal) &filetype == 'fzf' ? "\<C-L>" : "\<C-\>\<C-n>"
tnoremap <silent> <Plug>(fzf-insert) <Nop>
tnoremap <silent> <Plug>(fzf-normal) <C-\><C-n>
endif
function! s:execute_term(dict, command, temps) abort
@ -798,8 +799,6 @@ function! s:execute_term(dict, command, temps) abort
call self.switch_back(1)
else
if bufnr('') == self.buf
" Exit terminal mode first (see neovim#13769)
call feedkeys("\<Plug>(fzf-normal)")
" We use close instead of bd! since Vim does not close the split when
" there's no other listed buffer (nvim +'set nobuflisted')
close
@ -824,6 +823,10 @@ function! s:execute_term(dict, command, temps) abort
call s:pushd(self.dict)
call s:callback(self.dict, lines)
call self.switch_back(s:getpos() == self.ppos)
if &buftype == 'terminal'
call feedkeys(&filetype == 'fzf' ? "\<Plug>(fzf-insert)" : "\<Plug>(fzf-normal)")
endif
endfunction
try