Merge branch 'fix-over-remapping'

This commit is contained in:
haya14busa 2016-01-18 03:30:58 +09:00
commit c646db0fef

View File

@ -80,28 +80,9 @@ call s:search.connect(s:module)
"}}} "}}}
" CommandLine Keymap: {{{ " CommandLine Keymap: {{{
" .keymapping() won't be remapped by user defined KeyMappings.
function! s:search.keymapping() "{{{ function! s:search.keymapping() "{{{
return { return {
\ "\<C-l>" : {
\ "key" : "<Over>(buffer-complete)",
\ "noremap" : 1,
\ },
\ "\<Tab>" : {
\ "key" : "<Over>(em-scroll-f)",
\ "noremap" : 1,
\ },
\ "\<S-Tab>" : {
\ "key" : "<Over>(em-scroll-b)",
\ "noremap" : 1,
\ },
\ "\<C-o>" : {
\ "key" : "<Over>(em-jumpback)",
\ "noremap" : 1,
\ },
\ "\<C-z>" : {
\ "key" : "<Over>(em-openallfold)",
\ "noremap" : 1,
\ },
\ "\<CR>" : { \ "\<CR>" : {
\ "key" : "<Over>(exit)", \ "key" : "<Over>(exit)",
\ "noremap" : 1, \ "noremap" : 1,
@ -110,6 +91,12 @@ function! s:search.keymapping() "{{{
\ } \ }
endfunction "}}} endfunction "}}}
call s:search.cnoremap("\<C-l>", '<Over>(buffer-complete)')
call s:search.cnoremap("\<Tab>", '<Over>(em-scroll-f)')
call s:search.cnoremap("\<S-Tab>", '<Over>(em-scroll-b)')
call s:search.cnoremap("\<C-o>", '<Over>(em-jumpback)')
call s:search.cnoremap("\<C-z>", '<Over>(em-openallfold)')
" Fins Motion CommandLine Mapping Command: {{{ " Fins Motion CommandLine Mapping Command: {{{
function! EasyMotion#command_line#cmap(args) function! EasyMotion#command_line#cmap(args)
let lhs = s:as_keymapping(a:args[0]) let lhs = s:as_keymapping(a:args[0])