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

Remove init.vim

Browse Source
This commit is contained in:
haya14busa 2014-02-13 10:56:38 +09:00
parent 0c7eeb5514
commit ea8da5c03d
2 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
autoload/EasyMotion/init.vim
View File

@ -1,28 +0,0 @@
" Saving 'cpoptions' {{{
let s:save_cpo = &cpo
set cpo&vim
" }}}
function! EasyMotion#init#InitMappings(motions, do_mapping) "{{{
for [motion, fn] in items(a:motions)
" Mapping {{{
if exists('g:EasyMotion_mapping_' . motion)
" Backward compatible mapping [deprecated]
silent exec 'map <silent> ' .
\ eval('g:EasyMotion_mapping_' . motion) . ' <Plug>(easymotion-' . motion . ')'
elseif a:do_mapping
\ && !hasmapto('<Plug>(easymotion-' . motion . ')')
\ && empty(maparg('<Plug>(easymotion-prefix)' . motion, 'nov'))
" Do mapping
silent exec 'map <silent> ' .
\'<Plug>(easymotion-prefix)' . motion . ' <Plug>(easymotion-' . motion . ')'
endif "}}}
endfor
endfunction "}}}
" Restore 'cpoptions' {{{
let &cpo = s:save_cpo
unlet s:save_cpo
" }}}
" vim: fdm=marker:et:ts=4:sw=4:sts=4

29
plugin/EasyMotion.vim
View File

@ -3,7 +3,7 @@
" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com> " Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
" haya14busa <hayabusa1419@gmail.com> " haya14busa <hayabusa1419@gmail.com>
" Source: https://github.com/Lokaltog/vim-easymotion " Source: https://github.com/Lokaltog/vim-easymotion
" Last Change: 12 Feb 2014. " Last Change: 13 Feb 2014.
" == Script initialization {{{ " == Script initialization {{{
if expand("%:p") ==# expand("<sfile>:p") if expand("%:p") ==# expand("<sfile>:p")
unlet! g:EasyMotion_loaded unlet! g:EasyMotion_loaded
@ -261,13 +261,6 @@ xnoremap <silent><Plug>(easymotion-lineanywhere)
"}}} "}}}
"}}} "}}}
" map <silent><expr><Plug>(easymotion-clever-s)
" \ EasyMotion#is_active() ? '<Plug>(easymotion-next)' : '<Plug>(easymotion-s)'
" map <silent><expr><Plug>(easymotion-clever-s2)
" \ EasyMotion#is_active() ? '<Plug>(easymotion-next)' : '<Plug>(easymotion-s2)'
" map <silent><expr><Plug>(easymotion-clever-sn)
" \ EasyMotion#is_active() ? '<Plug>(easymotion-next)' : '<Plug>(easymotion-sn)'
noremap <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(0)<CR> noremap <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(0)<CR>
xnoremap <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(1)<CR> xnoremap <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(1)<CR>
@ -285,8 +278,26 @@ if g:EasyMotion_do_mapping == 1
endif endif
"}}} "}}}
function! s:default_mapping(motions, do_mapping) "{{{
for [motion, fn] in items(a:motions)
" Mapping {{{
if exists('g:EasyMotion_mapping_' . motion)
" Backward compatible mapping [deprecated]
silent exec 'map <silent> ' .
\ eval('g:EasyMotion_mapping_' . motion) . ' <Plug>(easymotion-' . motion . ')'
elseif a:do_mapping
\ && !hasmapto('<Plug>(easymotion-' . motion . ')')
\ && empty(maparg('<Plug>(easymotion-prefix)' . motion, 'nov'))
" Do mapping
silent exec 'map <silent> ' .
\'<Plug>(easymotion-prefix)' . motion . ' <Plug>(easymotion-' . motion . ')'
endif "}}}
endfor
endfunction "}}}
" Default Mapping: " Default Mapping:
call EasyMotion#init#InitMappings({ call s:default_mapping({
\ 'f' : { 'name': 'S' , 'dir': 0 } \ 'f' : { 'name': 'S' , 'dir': 0 }
\ , 'F' : { 'name': 'S' , 'dir': 1 } \ , 'F' : { 'name': 'S' , 'dir': 1 }
\ , 's' : { 'name': 'S' , 'dir': 2 } \ , 's' : { 'name': 'S' , 'dir': 2 }