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

Remove option g:EasyMotion_maximal_jumpmarks.

Browse Source
This commit is contained in:
YggdrasiI 2016-02-09 20:06:23 +01:00
parent e790e95834
commit d9c33fdd32
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/EasyMotion.vim
View File

@ -1308,8 +1308,7 @@ function! s:EasyMotion(regexp, direction, visualmode, is_inclusive, ...) " {{{
" but in this case, it's better to allows jump side effect " but in this case, it's better to allows jump side effect
" to gathering matched targets coordinates. " to gathering matched targets coordinates.
let pos = searchpos(regexp, search_direction . (config.accept_cursor_pos ? 'c' : ''), search_stopline) let pos = searchpos(regexp, search_direction . (config.accept_cursor_pos ? 'c' : ''), search_stopline)
let num_jumpmarks = 0 while 1
while l:num_jumpmarks < g:EasyMotion_maximal_jumpmarks
" Reached end of search range " Reached end of search range
if pos == [0, 0] if pos == [0, 0]
break break
@ -1328,7 +1327,6 @@ function! s:EasyMotion(regexp, direction, visualmode, is_inclusive, ...) " {{{
endif endif
"}}} "}}}
let pos = searchpos(regexp, search_direction, search_stopline) let pos = searchpos(regexp, search_direction, search_stopline)
let l:num_jumpmarks += 1
endwhile endwhile
"}}} "}}}
@ -1346,17 +1344,15 @@ function! s:EasyMotion(regexp, direction, visualmode, is_inclusive, ...) " {{{
keepjumps call cursor(s:current.cursor_position[0], keepjumps call cursor(s:current.cursor_position[0],
\ s:current.cursor_position[1]) \ s:current.cursor_position[1])
let l:num_jumpmarks = 0
let targets2 = [] let targets2 = []
if s:flag.within_line == 0 if s:flag.within_line == 0
let search_stopline = win_first_line let search_stopline = win_first_line
else else
let search_stopline = s:current.cursor_position[0] let search_stopline = s:current.cursor_position[0]
endif endif
while l:num_jumpmarks < g:EasyMotion_maximal_jumpmarks while 1
" TODO: refactoring " TODO: refactoring
let pos = searchpos(regexp, 'b', search_stopline) let pos = searchpos(regexp, 'b', search_stopline)
let l:num_jumpmarks += 1
" Reached end of search range " Reached end of search range
if pos == [0, 0] if pos == [0, 0]
break break

1
plugin/EasyMotion.vim
View File

@ -51,7 +51,6 @@ let g:EasyMotion_command_line_key_mappings =
\ get(g: , 'EasyMotion_command_line_key_mappings' , {}) \ get(g: , 'EasyMotion_command_line_key_mappings' , {})
let g:EasyMotion_disable_two_key_combo = let g:EasyMotion_disable_two_key_combo =
\ get(g: , 'EasyMotion_disable_two_key_combo' , 0) \ get(g: , 'EasyMotion_disable_two_key_combo' , 0)
let g:EasyMotion_maximal_jumpmarks = get(g: , 'EasyMotion_maximal_jumpmarks' , 999)
"}}} "}}}

2
t/compare_movements_spec.vim
View File

@ -201,8 +201,10 @@ describe 'Keyword word motion'
end end
it 'Simple test to check setup of this test' it 'Simple test to check setup of this test'
" Check if a is remapped to <Nop> to avoid start of insert mode.
normal aa\<Esc> normal aa\<Esc>
Expect getline(1) == '' Expect getline(1) == ''
call AddLine('word') call AddLine('word')
Expect CompareMovements('w', 'w', 0) == 0 Expect CompareMovements('w', 'w', 0) == 0
Expect CompareMovements('w', '\wa', 0) == 0 Expect CompareMovements('w', '\wa', 0) == 0