From b946f46f51e8b130ad6d37462fb21730777b9321 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 21:44:53 +0800
Subject: [PATCH] Fix #196

---
 autoload/SpaceVim/layers/tools.vim      | 6 ++++++
 autoload/SpaceVim/plugins.vim           | 4 ----
 autoload/zvim/plug.vim                  | 4 ++++
 config/plugins_before/vim-bookmarks.vim | 9 +++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 config/plugins_before/vim-bookmarks.vim

diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim
index 722e67b70..586d2d292 100644
--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@@ -6,6 +6,7 @@ function! SpaceVim#layers#tools#plugins() abort
                 \ ['junegunn/goyo.vim',         { 'on_cmd' : 'Goyo', 'loadconf' : 1}],
                 \ ['junegunn/limelight.vim',    { 'on_cmd' : 'Limelight'}],
                 \ ['Yggdroot/LeaderF', {'merged' : 0}],
+                \ ['MattesGroeger/vim-bookmarks', { 'on_map' : '<Plug>Bookmark', 'loadconf_before' : 1}],
                 \ ['google/vim-searchindex'],
                 \ ['simnalamburt/vim-mundo',        { 'on_cmd' : 'MundoToggle'}],
                 \ ['wsdjeg/MarkDown.pl',            { 'on_cmd' : 'MarkDownPreview'}],
@@ -34,6 +35,11 @@ function! SpaceVim#layers#tools#plugins() abort
 endfunction
 
 function! SpaceVim#layers#tools#config() abort
+    nmap mm <Plug>BookmarkToggle
+    nmap mi <Plug>BookmarkAnnotate
+    nmap ma <Plug>BookmarkShowAll
+    nmap mn <Plug>BookmarkNext
+    nmap mp <Plug>BookmarkPrev
     nnoremap <silent> <F7> :MundoToggle<CR>
     augroup rainbow_lisp
         autocmd!
diff --git a/autoload/SpaceVim/plugins.vim b/autoload/SpaceVim/plugins.vim
index a65ba61c0..eb05d6033 100644
--- a/autoload/SpaceVim/plugins.vim
+++ b/autoload/SpaceVim/plugins.vim
@@ -11,7 +11,6 @@ function! SpaceVim#plugins#load() abort
 endfunction
 function! s:load_plugins() abort
     for group in g:spacevim_plugin_groups
-        let g:spacevim_plugin_layer = group
         for plugin in s:getLayerPlugins(group)
             if len(plugin) == 2
                 call zvim#plug#add(plugin[0], plugin[1])
@@ -27,9 +26,6 @@ function! s:load_plugins() abort
         endfor
         call s:loadLayerConfig(group)
     endfor
-    if exists('g:spacevim_plugin_layer')
-        unlet g:spacevim_plugin_layer
-    endif
     for plugin in g:spacevim_custom_plugins
         if len(plugin) == 2
             call zvim#plug#add(plugin[0], plugin[1])
diff --git a/autoload/zvim/plug.vim b/autoload/zvim/plug.vim
index c235aee82..c5916e479 100644
--- a/autoload/zvim/plug.vim
+++ b/autoload/zvim/plug.vim
@@ -150,20 +150,24 @@ fu! s:parser(args)
 endf
 
 function! zvim#plug#add(repo,...) abort
+    let g:spacevim_plugin_name = ''
     if g:spacevim_plugin_manager == 'neobundle'
         exec 'NeoBundle "'.a:repo.'"'.','.join(a:000,',')
+        let g:spacevim_plugin_name = split(a:repo, '/')[-1]
     elseif g:spacevim_plugin_manager == 'dein'
         if len(a:000) > 0
             call dein#add(a:repo,s:parser(a:000[0]))
         else
             call dein#add(a:repo)
         endif
+        let g:spacevim_plugin_name = g:dein#name
     elseif g:spacevim_plugin_manager == 'vim-plug'
         if len(a:000) > 0
             exec "Plug '".a:repo."', ".join(a:000,',')
         else
             exec "Plug '".a:repo."'"
         endif
+        let g:spacevim_plugin_name = split(a:repo, '/')[-1]
     endif
     let str = get(g:,'spacevim_plugin_layer', 'custom plugin')
     let str = '[' . str . ']'
diff --git a/config/plugins_before/vim-bookmarks.vim b/config/plugins_before/vim-bookmarks.vim
new file mode 100644
index 000000000..17a58c73a
--- /dev/null
+++ b/config/plugins_before/vim-bookmarks.vim
@@ -0,0 +1,9 @@
+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