From bc35463da0668df7493f24e6bd78d1807409031d Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 15 Jan 2017 08:11:23 +0800
Subject: [PATCH] Fix custom layer support

---
 autoload/SpaceVim.vim         |  6 +++---
 autoload/SpaceVim/default.vim | 33 +++++++++++++++------------------
 autoload/SpaceVim/mapping.vim | 17 +++++++++++++++--
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index cb19c68cd..05f6a293f 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -199,21 +199,21 @@ function! SpaceVim#loadCustomConfig() abort
     endif
 
     if !empty(custom_confs)
-        exe 'source ' . custom_confs[0]
         if isdirectory('.SpaceVim.d')
             exe 'set rtp ^=' . expand('.SpaceVim.d')
         endif
+        exe 'source ' . custom_confs[0]
         if filereadable(custom_glob_conf) && g:spacevim_force_global_config
-            exe 'source ' . custom_glob_conf
             if isdirectory(expand('~/.SpaceVim.d/'))
                 set runtimepath^=~/.SpaceVim.d
             endif
+            exe 'source ' . custom_glob_conf
         endif
     elseif filereadable(custom_glob_conf)
-        exe 'source ' . custom_glob_conf
         if isdirectory(expand('~/.SpaceVim.d/'))
             set runtimepath^=~/.SpaceVim.d
         endif
+        exe 'source ' . custom_glob_conf
     endif
 endfunction
 
diff --git a/autoload/SpaceVim/default.vim b/autoload/SpaceVim/default.vim
index 65bf86ee7..6262fe5a0 100644
--- a/autoload/SpaceVim/default.vim
+++ b/autoload/SpaceVim/default.vim
@@ -323,44 +323,41 @@ function! SpaceVim#default#SetMappings() abort
     nnoremap <silent><M-x> :call chat#qq#OpenMsgWin()<CR>
     "weixin hot key
     nnoremap <silent><M-w> :call chat#weixin#OpenMsgWin()<CR>
-    "chatting hot key
-    nnoremap <silent><M-c> :call chat#chatting#OpenMsgWin()<CR>
+    call SpaceVim#mapping#def('nnoremap <silent>','<M-c>',':call chat#chatting#OpenMsgWin()<cr>','Open chatting room','call chat#chatting#OpenMsgWin()')
 
-    "format current buffer
-    nnoremap <silent> g= :call zvim#format()<cr>
+    call SpaceVim#mapping#def('nnoremap <silent>','g=',':call zvim#format()<cr>','format current buffer','call zvim#format')
 
-
-    call zvim#util#defineMap('vnoremap', '<Leader>S', "y:execute @@<CR>:echo 'Sourced selection.'<CR>",
+    call SpaceVim#mapping#def('vnoremap', '<Leader>S', "y:execute @@<CR>:echo 'Sourced selection.'<CR>",
                 \ 'Sourced selection.',
                 \ "echo 'Use <leader>S to sourced selection.'")
-    call zvim#util#defineMap('nnoremap','<Leader>S',"^vg_y:execute @@<CR>:echo 'Sourced line.'<CR>",'Source line',
+    call SpaceVim#mapping#def('nnoremap','<Leader>S',"^vg_y:execute @@<CR>:echo 'Sourced line.'<CR>",'Source line',
                 \ "echo 'Use <leader>S to sourced line.'")
 
-    call zvim#util#defineMap('nnoremap <silent>', '<C-c>', ':<c-u>call zvim#util#CopyToClipboard()<cr>',
+    call SpaceVim#mapping#def('nnoremap <silent>', '<C-c>', ':<c-u>call zvim#util#CopyToClipboard()<cr>',
                 \ 'Copy buffer absolute path to X11 clipboard','call zvim#util#CopyToClipboard()')
-    call zvim#util#defineMap('nnoremap <silent>', '<Leader><C-c>',
+    call SpaceVim#mapping#def('nnoremap <silent>', '<Leader><C-c>',
                 \ ':<c-u>call zvim#util#CopyToClipboard(1)<cr>',
                 \ 'Yank the github link of current file to X11 clipboard',
                 \ 'call zvim#util#CopyToClipboard(1)')
-    call zvim#util#defineMap('nnoremap <silent>', '<Leader><C-l>',
+    call SpaceVim#mapping#def('nnoremap <silent>', '<Leader><C-l>',
                 \ ':<c-u>call zvim#util#CopyToClipboard(2)<cr>',
                 \ 'Yank the github link of current line to X11 clipboard',
                 \ 'call zvim#util#CopyToClipboard(2)')
-    call zvim#util#defineMap('vnoremap <silent>', '<Leader><C-l>',
+    call SpaceVim#mapping#def('vnoremap <silent>', '<Leader><C-l>',
                 \ ':<c-u>call zvim#util#CopyToClipboard(3)<cr>',
                 \ 'Yank the github link of current selection to X11 clipboard',
                 \ 'call zvim#util#CopyToClipboard(3)')
-    call zvim#util#defineMap('nnoremap <silent>', '<Tab>', ':wincmd w<CR>', 'Switch to next window or tab','wincmd w')
-    call zvim#util#defineMap('nnoremap <silent>', '<S-Tab>', ':wincmd p<CR>', 'Switch to previous window or tab','wincmd p')
-    call zvim#util#defineMap('nnoremap <silent>', 'q', ':<C-u>call zvim#util#SmartClose()<cr>',
+    call SpaceVim#mapping#def('nnoremap <silent>', '<Tab>', ':wincmd w<CR>', 'Switch to next window or tab','wincmd w')
+    call SpaceVim#mapping#def('nnoremap <silent>', '<S-Tab>', ':wincmd p<CR>', 'Switch to previous window or tab','wincmd p')
+    call SpaceVim#mapping#def('nnoremap <silent>', 'q', ':<C-u>call zvim#util#SmartClose()<cr>',
                 \ 'Smart close windows',
                 \ 'call zvim#util#SmartClose()')
-    call zvim#util#defineMap('nnoremap <silent>', '<Leader>qr', 'q', 'Toggle recording','')
-    call zvim#util#defineMap('nnoremap <silent>', '<Leader>sv', ':split<CR>:wincmd p<CR>:e#<CR>',
+    call SpaceVim#mapping#def('nnoremap <silent>', '<Leader>qr', 'q', 'Toggle recording','')
+    call SpaceVim#mapping#def('nnoremap <silent>', '<Leader>sv', ':split<CR>:wincmd p<CR>:e#<CR>',
                 \'Open previous buffer in split window' , 'split|wincmd p|e#')
-    call zvim#util#defineMap('nnoremap <silent>', '<Leader>sg', ':vsplit<CR>:wincmd p<CR>:e#<CR>',
+    call SpaceVim#mapping#def('nnoremap <silent>', '<Leader>sg', ':vsplit<CR>:wincmd p<CR>:e#<CR>',
                 \'Open previous buffer in vsplit window' , 'vsplit|wincmd p|e#')
-    call zvim#util#defineMap('nnoremap <silent>', 'gf', ':call zvim#gf()<CR>', 'Jump to a file under cursor', '')
+    call SpaceVim#mapping#def('nnoremap <silent>', 'gf', ':call zvim#gf()<CR>', 'Jump to a file under cursor', '')
 endfunction
 
 fu! s:tobur(num) abort
diff --git a/autoload/SpaceVim/mapping.vim b/autoload/SpaceVim/mapping.vim
index b9227e409..1593058c9 100644
--- a/autoload/SpaceVim/mapping.vim
+++ b/autoload/SpaceVim/mapping.vim
@@ -1,3 +1,16 @@
-function! SpaceVim#mapping#def() abort
-    
+let g:unite_source_menu_menus =
+            \ get(g:,'unite_source_menu_menus',{})
+let g:unite_source_menu_menus.CustomKeyMaps = {'description':
+            \ 'Custom mapped keyboard shortcuts                   [unite]<SPACE>'}
+let g:unite_source_menu_menus.CustomKeyMaps.command_candidates =
+            \ get(g:unite_source_menu_menus.CustomKeyMaps,'command_candidates', [])
+
+function! SpaceVim#mapping#def(type,key,value,desc,...) abort
+    exec a:type . ' ' . a:key . ' ' . a:value
+    let description = '➤ '
+                \. a:desc
+                \. repeat(' ', 80 - len(a:desc) - len(a:key))
+                \. a:key
+    let cmd = len(a:000) > 0 ? a:000[0] : a:value
+    call add(g:unite_source_menu_menus.CustomKeyMaps.command_candidates, [description,cmd])
 endfunction