diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 06a8f7ab4..f63d1d9ec 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -356,7 +356,8 @@ endif let g:spacevim_leader_guide_max_size = 0 if !exists("g:leaderGuide_submode_mappings") - let g:leaderGuide_submode_mappings = {'': "win_close"} + let g:leaderGuide_submode_mappings = + \ { '': 'win_close', 'n': 'page_down', 'p': 'page_up', 'u' : 'undo'} endif let g:spacevim_leader_guide_submode_mappings = {'': "win_close"} @@ -468,8 +469,6 @@ function! SpaceVim#end() abort vnoremap :LeaderGuideVisual get(g:, 'mapleader', '\') endif let g:leaderGuide_max_size = 15 - let g:leaderGuide_submode_mappings = - \ { '': 'win_close', '': 'page_down', '': 'page_up', 'u' : 'undo'} call SpaceVim#plugins#load() endfunction diff --git a/autoload/SpaceVim/mapping/guide.vim b/autoload/SpaceVim/mapping/guide.vim index a3d21f9d3..debbc330f 100644 --- a/autoload/SpaceVim/mapping/guide.vim +++ b/autoload/SpaceVim/mapping/guide.vim @@ -417,7 +417,7 @@ endfunction function! s:guide_help_msg() abort if s:guide_help_mode == 1 - let msg = ' n -> next-page, p -> previous-page, u -> undo-key, h -> help, a -> abort' + let msg = ' n -> next-page, p -> previous-page, u -> undo-key' else let msg = ' [C-h paging/help]' endif @@ -443,6 +443,8 @@ function! s:page_down() " {{{ endfunction " }}} function! s:page_undo() " {{{ call s:winclose() + let s:guide_group = {} + let s:prefix_key_inp = '' let s:lmap = s:lmap_undo call s:start_buffer() endfunction " }}} @@ -464,6 +466,10 @@ function! s:handle_submode_mapping(cmd) " {{{ call s:page_undo() elseif a:cmd ==? 'win_close' call s:winclose() + else + call feedkeys("\", "n") + redraw! + call s:wait_for_input() endif endfunction " }}} function! s:submode_mappings() " {{{