From 7504b3398470f0f7a68fd1b92f8ad3d1c4dba52b Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Tue, 4 Apr 2017 10:35:38 +0800
Subject: [PATCH 1/2] Fix #392

---
 autoload/SpaceVim.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index 31985a8ab..6171daf39 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -351,10 +351,6 @@ endif
 
 let g:spacevim_leader_guide_submode_mappings = {'<C-C>': "win_close"}
 
-if !SpaceVim#mapping#guide#has_configuration()
-  let g:leaderGuide_map = {}
-  call SpaceVim#mapping#guide#register_prefix_descriptions('', 'g:leaderGuide_map')
-endif
 
 
 command -nargs=1 LeaderGuide call SpaceVim#mapping#guide#start_by_prefix('0', <args>)
@@ -403,6 +399,10 @@ function! SpaceVim#end() abort
   if !empty(g:spacevim_denite_leader)
     call SpaceVim#mapping#leader#defindDeniteLeader(g:spacevim_denite_leader)
   endif
+  if !SpaceVim#mapping#guide#has_configuration()
+    let g:leaderGuide_map = {}
+    call SpaceVim#mapping#guide#register_prefix_descriptions('', 'g:leaderGuide_map')
+  endif
   call SpaceVim#mapping#leader#defindglobalMappings()
   if g:spacevim_simple_mode
     let g:spacevim_plugin_groups = ['core']

From 1cc8352acf53d44bd90e83fd57b8841120f25dcc Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 5 Apr 2017 23:26:05 +0800
Subject: [PATCH 2/2] Fix mapping

---
 config/plugins_before/vim-bookmarks.vim | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/plugins_before/vim-bookmarks.vim b/config/plugins_before/vim-bookmarks.vim
index 17a58c73a..83c16b056 100644
--- a/config/plugins_before/vim-bookmarks.vim
+++ b/config/plugins_before/vim-bookmarks.vim
@@ -1,9 +1,7 @@
-nmap <Leader><Leader> <Plug>BookmarkToggle
-nmap <Leader>i <Plug>BookmarkAnnotate
-nmap <Leader>a <Plug>BookmarkShowAll
-nmap <Leader>j <Plug>BookmarkNext
-nmap <Leader>k <Plug>BookmarkPrev 
-nmap <Leader>c <Plug>BookmarkClear 
-nmap <Leader>x <Plug>BookmarkClearAll
-nmap <Leader>kk <Plug>BookmarkMoveUp
-nmap <Leader>jj <Plug>BookmarkMoveDown
+nmap <Leader>m <Plug>BookmarkToggle
+nmap <Leader>mi <Plug>BookmarkAnnotate
+nmap <Leader>ma <Plug>BookmarkShowAll
+nmap <Leader>mj <Plug>BookmarkNext
+nmap <Leader>mk <Plug>BookmarkPrev 
+nmap <Leader>mc <Plug>BookmarkClear 
+nmap <Leader>mx <Plug>BookmarkClearAll