vim/vim-easymotion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update vital-over

Browse Source
This commit is contained in:
haya14busa 2014-02-06 19:08:14 +09:00
parent 69f2be39f2
commit 262152aad0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autoload/vital/_easymotion/Over/Commandline.vim
View File

@ -137,7 +137,11 @@ function! s:base.is_input(key, ...)
let prekey = get(a:, 1, "") let prekey = get(a:, 1, "")
return self.get_tap_key() == prekey return self.get_tap_key() == prekey
\ && self.char() == a:key \ && self.char() == a:key
" \ && s:_unmap(self._get_keymapping(), self.char()).key == a:key endfunction
function! s:base.input_key()
return self.variables.input_key
endfunction endfunction
@ -219,10 +223,10 @@ function! s:base.exit(...)
endfunction endfunction
function! s:base.cancel() " function! s:base.cancel()
call self.exit(1) " call self.exit(1)
call self._on_cancel() " call self._on_cancel()
endfunction " endfunction
function! s:base.exit_code() function! s:base.exit_code()
@ -328,9 +332,9 @@ function! s:base._main(...)
while !self._is_exit() while !self._is_exit()
call s:_echo_cmdline(self) call s:_echo_cmdline(self)
let self.variables.char = s:_unmap(self._get_keymapping(), s:_getchar()) let self.variables.input_key = s:_getchar()
let self.variables.char = s:_unmap(self._get_keymapping(), self.variables.input_key)
" let self.variables.char = s:_getchar()
call self.setchar(self.variables.char) call self.setchar(self.variables.char)
call self._on_char_pre() call self._on_char_pre()

3
autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
View File

@ -11,7 +11,8 @@ function! s:module.on_char_pre(cmdline)
\ || a:cmdline.is_input("\<C-c>") \ || a:cmdline.is_input("\<C-c>")
\ ||(a:cmdline.is_input("\<BS>") && a:cmdline.line.length() == 0) \ ||(a:cmdline.is_input("\<BS>") && a:cmdline.line.length() == 0)
\ ||(a:cmdline.is_input("\<C-h>") && a:cmdline.line.length() == 0) \ ||(a:cmdline.is_input("\<C-h>") && a:cmdline.line.length() == 0)
call a:cmdline.cancel() " call a:cmdline.cancel()
call a:cmdline.exit(1)
call a:cmdline.setchar("") call a:cmdline.setchar("")
endif endif
endfunction endfunction