Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-03 04:00:04 +08:00
Code Issues Projects Releases Wiki Activity

Fix custom layer support

Browse Source
This commit is contained in:
wsdjeg 2017-01-15 08:11:23 +08:00
parent 3397766e85
commit bc35463da0
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/SpaceVim.vim
View File

@ -199,21 +199,21 @@ function! SpaceVim#loadCustomConfig() abort
endif endif
if !empty(custom_confs) if !empty(custom_confs)
exe 'source ' . custom_confs[0]
if isdirectory('.SpaceVim.d') if isdirectory('.SpaceVim.d')
exe 'set rtp ^=' . expand('.SpaceVim.d') exe 'set rtp ^=' . expand('.SpaceVim.d')
endif endif
exe 'source ' . custom_confs[0]
if filereadable(custom_glob_conf) && g:spacevim_force_global_config if filereadable(custom_glob_conf) && g:spacevim_force_global_config
exe 'source ' . custom_glob_conf
if isdirectory(expand('~/.SpaceVim.d/')) if isdirectory(expand('~/.SpaceVim.d/'))
set runtimepath^=~/.SpaceVim.d set runtimepath^=~/.SpaceVim.d
endif endif
exe 'source ' . custom_glob_conf
endif endif
elseif filereadable(custom_glob_conf) elseif filereadable(custom_glob_conf)
exe 'source ' . custom_glob_conf
if isdirectory(expand('~/.SpaceVim.d/')) if isdirectory(expand('~/.SpaceVim.d/'))
set runtimepath^=~/.SpaceVim.d set runtimepath^=~/.SpaceVim.d
endif endif
exe 'source ' . custom_glob_conf
endif endif
endfunction endfunction

33
autoload/SpaceVim/default.vim
View File

@ -323,44 +323,41 @@ function! SpaceVim#default#SetMappings() abort
nnoremap <silent><M-x> :call chat#qq#OpenMsgWin()<CR> nnoremap <silent><M-x> :call chat#qq#OpenMsgWin()<CR>
"weixin hot key "weixin hot key
nnoremap <silent><M-w> :call chat#weixin#OpenMsgWin()<CR> nnoremap <silent><M-w> :call chat#weixin#OpenMsgWin()<CR>
"chatting hot key call SpaceVim#mapping#def('nnoremap <silent>','<M-c>',':call chat#chatting#OpenMsgWin()<cr>','Open chatting room','call chat#chatting#OpenMsgWin()')
nnoremap <silent><M-c> :call chat#chatting#OpenMsgWin()<CR>
"format current buffer call SpaceVim#mapping#def('nnoremap <silent>','g=',':call zvim#format()<cr>','format current buffer','call zvim#format')
nnoremap <silent> g= :call zvim#format()<cr>
call SpaceVim#mapping#def('vnoremap', '<Leader>S', "y:execute @@<CR>:echo 'Sourced selection.'<CR>",
call zvim#util#defineMap('vnoremap', '<Leader>S', "y:execute @@<CR>:echo 'Sourced selection.'<CR>",
\ 'Sourced selection.', \ 'Sourced selection.',
\ "echo 'Use <leader>S to 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.'") \ "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()') \ '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>', \ ':<c-u>call zvim#util#CopyToClipboard(1)<cr>',
\ 'Yank the github link of current file to X11 clipboard', \ 'Yank the github link of current file to X11 clipboard',
\ 'call zvim#util#CopyToClipboard(1)') \ '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>', \ ':<c-u>call zvim#util#CopyToClipboard(2)<cr>',
\ 'Yank the github link of current line to X11 clipboard', \ 'Yank the github link of current line to X11 clipboard',
\ 'call zvim#util#CopyToClipboard(2)') \ '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>', \ ':<c-u>call zvim#util#CopyToClipboard(3)<cr>',
\ 'Yank the github link of current selection to X11 clipboard', \ 'Yank the github link of current selection to X11 clipboard',
\ 'call zvim#util#CopyToClipboard(3)') \ 'call zvim#util#CopyToClipboard(3)')
call zvim#util#defineMap('nnoremap <silent>', '<Tab>', ':wincmd w<CR>', 'Switch to next window or tab','wincmd w') call SpaceVim#mapping#def('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 SpaceVim#mapping#def('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>', 'q', ':<C-u>call zvim#util#SmartClose()<cr>',
\ 'Smart close windows', \ 'Smart close windows',
\ 'call zvim#util#SmartClose()') \ 'call zvim#util#SmartClose()')
call zvim#util#defineMap('nnoremap <silent>', '<Leader>qr', 'q', 'Toggle recording','') call SpaceVim#mapping#def('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>sv', ':split<CR>:wincmd p<CR>:e#<CR>',
\'Open previous buffer in split window' , 'split|wincmd p|e#') \'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#') \'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 endfunction
fu! s:tobur(num) abort fu! s:tobur(num) abort

15
autoload/SpaceVim/mapping.vim
View File

@ -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 endfunction