lauchmelder/vim-sussify
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Enforce mapping order when using <nowait>

Browse source 
Opposed to normal mappings, the definition order is important when using
<nowait> mappings.

Simple test case:

:enew | nnoremap <buffer><nowait> 1 :echo "foo"<cr>| nnoremap <buffer><nowait> 11 :echo "bar"<cr>

Then hit 1 in normal mode.

:enew | nnoremap <buffer><nowait> 11 :echo "foo"<cr>| nnoremap <buffer><nowait> 1 :echo "bar"<cr>

Then hit 1 in normal mode again.

References #252.
This commit is contained in:
Marco Hinz 2016-12-06 20:56:54 +01:00
parent 3a5ac99e12
commit 07b122f7b4
No known key found for this signature in database
GPG key ID: 1C980A1B657B4A4F
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
autoload/startify.vim
View file

@ -728,9 +728,13 @@ function! s:set_mappings() abort
nnoremap <buffer><expr> n ' j'[v:searchforward].'n'
nnoremap <buffer><expr> N 'j '[v:searchforward].'N'
for k in keys(b:startify.entries)
execute 'nnoremap <buffer><silent>'. b:startify.entries[k].nowait b:startify.entries[k].index
\ ':call startify#open_buffers('. string(k) .')<cr>'
function! s:compare_by_index(foo, bar)
return a:foo.index - a:bar.index
endfunction
for entry in sort(values(b:startify.entries), 's:compare_by_index')
execute 'nnoremap <buffer><silent>'. entry.nowait entry.index
\ ':call startify#open_buffers('. string(entry.line) .')<cr>'
endfor
" Prevent 'nnoremap j gj' mappings, since they would break navigation.
@ -851,6 +855,7 @@ function! s:register(line, index, type, cmd, path, wait)
let b:startify.entries[a:line] = {
\ 'index': a:index,
\ 'type': a:type,
\ 'line': a:line,
\ 'cmd': a:cmd,
\ 'path': a:path,
\ 'nowait': a:wait,