empathicqubit/fzf.vim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Feed 'a' only when Neovim terminal is used"

Browse source 
This reverts commit a48a9e8064.
This commit is contained in:
Junegunn Choi 2016-06-20 22:39:44 +09:00
parent a48a9e8064
commit 4d252902c9
No known key found for this signature in database
GPG key ID: 254BC280FEF9C627
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
autoload/fzf/vim.vim
View file

@ -709,16 +709,9 @@ function! s:format_cmd(line)
\ '\=s:nbs.s:yellow(submatch(1), "Function").s:nbs', '')
endfunction
function! s:command_sink(lines)
if len(a:lines) < 2
return
endif
let cmd = matchstr(a:lines[1], s:nbs.'\zs\S*\ze'.s:nbs)
if a:lines[0] == 'ctrl-x'
execute cmd
else
call feedkeys(':'.cmd.(a:lines[1] == '!' ? '' : ' '))
endif
function! s:command_sink(cmd)
let cmd = matchstr(a:cmd, s:nbs.'\zs\S*\ze'.s:nbs)
call feedkeys(':'.cmd.(a:cmd[0] == '!' ? '' : ' '))
endfunction
function! s:format_excmd(ex)
@ -759,8 +752,8 @@ function! fzf#vim#commands(...)
let list = split(cout, "\n")
return s:fzf({
\ 'source': extend(extend(list[0:0], map(list[1:], 's:format_cmd(v:val)')), s:excmds()),
\ 'sink*': s:function('s:command_sink'),
\ 'options': '--ansi --expect ctrl-x --tiebreak=index --header-lines 1 -x --prompt "Commands> " -n2,3,2..3 -d'.s:nbs}, a:000)
\ 'sink': s:function('s:command_sink'),
\ 'options': '--ansi --tiebreak=index --header-lines 1 -x --prompt "Commands> " -n2,3,2..3 -d'.s:nbs}, a:000)
endfunction
" ------------------------------------------------------------------
@ -1032,8 +1025,8 @@ function! s:complete_insert(lines)
let data = call(s:reducer, [a:lines])
execute 'normal!' ((s:eol || empty(chars)) ? '' : 'h').del.(s:eol ? 'a': 'i').data
if mode() =~ 't'
call feedkeys('a', 'n')
if has('nvim')
call feedkeys('a')
else
execute "normal! \<esc>la"
endif