Merge branch 'develop' into feature/up-down-motions

* develop:
  Refactor w/b motions
  Add documentation for ge motion
This commit is contained in:
Kim Silkebækken 2011-03-30 18:45:32 +02:00
commit 2fd30d04c9
2 changed files with 8 additions and 10 deletions

View File

@ -123,6 +123,7 @@ mode:
<Leader>w See |w| <Leader>w See |w|
<Leader>e See |e| <Leader>e See |e|
<Leader>b See |b| <Leader>b See |b|
<Leader>ge See |ge|
Default: 1 Default: 1

View File

@ -50,15 +50,15 @@
nnoremap <silent> <Leader>T :call EasyMotionT(0, 1)<CR> nnoremap <silent> <Leader>T :call EasyMotionT(0, 1)<CR>
vnoremap <silent> <Leader>T :<C-U>call EasyMotionT(1, 1)<CR> vnoremap <silent> <Leader>T :<C-U>call EasyMotionT(1, 1)<CR>
nnoremap <silent> <Leader>w :call EasyMotionW(0)<CR> nnoremap <silent> <Leader>w :call EasyMotionWB(0, 0)<CR>
vnoremap <silent> <Leader>w :<C-U>call EasyMotionW(1)<CR> vnoremap <silent> <Leader>w :<C-U>call EasyMotionWB(1, 0)<CR>
nnoremap <silent> <Leader>b :call EasyMotionWB(0, 1)<CR>
vnoremap <silent> <Leader>b :<C-U>call EasyMotionWB(1, 1)<CR>
nnoremap <silent> <Leader>e :call EasyMotionE(0, 0)<CR> nnoremap <silent> <Leader>e :call EasyMotionE(0, 0)<CR>
vnoremap <silent> <Leader>e :<C-U>call EasyMotionE(1, 0)<CR> vnoremap <silent> <Leader>e :<C-U>call EasyMotionE(1, 0)<CR>
nnoremap <silent> <Leader>b :call EasyMotionB(0)<CR>
vnoremap <silent> <Leader>b :<C-U>call EasyMotionB(1)<CR>
nnoremap <silent> <Leader>ge :call EasyMotionE(0, 1)<CR> nnoremap <silent> <Leader>ge :call EasyMotionE(0, 1)<CR>
vnoremap <silent> <Leader>ge :<C-U>call EasyMotionE(1, 1)<CR> vnoremap <silent> <Leader>ge :<C-U>call EasyMotionE(1, 1)<CR>
endif endif
@ -104,15 +104,12 @@
call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '') call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '')
endfunction " }}} endfunction " }}}
function! EasyMotionW(visualmode) " {{{ function! EasyMotionWB(visualmode, direction) " {{{
call s:EasyMotion('\<.', 0, a:visualmode ? visualmode() : '') call s:EasyMotion('\<.', a:direction, a:visualmode ? visualmode() : '')
endfunction " }}} endfunction " }}}
function! EasyMotionE(visualmode, direction) " {{{ function! EasyMotionE(visualmode, direction) " {{{
call s:EasyMotion('.\>', a:direction, a:visualmode ? visualmode() : '') call s:EasyMotion('.\>', a:direction, a:visualmode ? visualmode() : '')
endfunction " }}} endfunction " }}}
function! EasyMotionB(visualmode) " {{{
call s:EasyMotion('\<.', 1, a:visualmode ? visualmode() : '')
endfunction " }}}
" }}} " }}}
" Helper functions {{{ " Helper functions {{{
function! s:Message(message) " {{{ function! s:Message(message) " {{{