diff --git a/README.md b/README.md index 26eec8cb3..3203b5796 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ through search tools: `ag`, `rg`, `ack`, `pt` and `grep`, Choose one you like. [**Mnemonic key bindings navigation**](http://spacevim.org/mnemonic-key-bindings-navigation/) You don't need to remember any key bindings, as the mapping guide will show up after the SPC is pressed. -The mapping guide is also available for `g`, `z`, `s`, `f` and `F`. +The mapping guide is also available for `g`, `z`, and `s`. ![mapping guide](https://user-images.githubusercontent.com/13142418/35568184-9a318082-058d-11e8-9d88-e0eafd1d498d.gif) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index e331148c2..db8715339 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -616,7 +616,6 @@ function! SpaceVim#end() abort endif call SpaceVim#mapping#g#init() call SpaceVim#mapping#z#init() - call SpaceVim#mapping#leader#defindglobalMappings() call SpaceVim#mapping#leader#defindKEYs() call SpaceVim#mapping#space#init() if !SpaceVim#mapping#guide#has_configuration() diff --git a/autoload/SpaceVim/default.vim b/autoload/SpaceVim/default.vim index 81b2f4094..81644b894 100644 --- a/autoload/SpaceVim/default.vim +++ b/autoload/SpaceVim/default.vim @@ -152,6 +152,53 @@ function! SpaceVim#default#layers() abort endfunction function! SpaceVim#default#keyBindings() abort + if g:spacevim_enable_insert_leader + inoremap =MyLeaderTabfunc() + endif + + " yark and paste + xnoremap y "+y + xnoremap d "+d + nnoremap p "+p + nnoremap P "+P + xnoremap p "+p + xnoremap P "+P + + cnoremap + + " Location list movement + let g:_spacevim_mappings.l = {'name' : '+Location movement'} + call SpaceVim#mapping#def('nnoremap', 'lj', ':lnext', + \ 'Jump to next location list position', + \ 'lnext', + \ 'Next location list') + call SpaceVim#mapping#def('nnoremap', 'lk', ':lprev', + \ 'Jump to previous location list position', + \ 'lprev', + \ 'Previous location list') + call SpaceVim#mapping#def('nnoremap', 'lq', ':lclose', + \ 'Close the window showing the location list', + \ 'lclose', + \ 'Close location list window') + + " quickfix list movement + let g:_spacevim_mappings.q = {'name' : '+Quickfix movement'} + call SpaceVim#mapping#def('nnoremap', 'qj', ':cnext', + \ 'Jump to next quickfix list position', + \ 'cnext', + \ 'Next quickfix list') + call SpaceVim#mapping#def('nnoremap', 'qk', ':cprev', + \ 'Jump to previous quickfix list position', + \ 'cprev', + \ 'Previous quickfix list') + call SpaceVim#mapping#def('nnoremap', 'qq', ':cclose', + \ 'Close quickfix list window', + \ 'cclose', + \ 'Close quickfix list window') + call SpaceVim#mapping#def('nnoremap ', 'qr', 'q', + \ 'Toggle recording', + \ '', + \ 'Toggle recording mode') " Save a file with sudo " http://forrst.com/posts/Use_w_to_sudo_write_a_file_with_Vim-uAN diff --git a/autoload/SpaceVim/layers/colorscheme.vim b/autoload/SpaceVim/layers/colorscheme.vim index 822ba3ad5..0a09ad38a 100644 --- a/autoload/SpaceVim/layers/colorscheme.vim +++ b/autoload/SpaceVim/layers/colorscheme.vim @@ -192,7 +192,6 @@ function! SpaceVim#layers#colorscheme#config() abort call SpaceVim#mapping#space#def('nnoremap', ['T', 'n'], \ 'call call(' . string(s:_function('s:cycle_spacevim_theme')) \ . ', [])', 'cycle-spacevim-theme', 1) - call SpaceVim#mapping#space#def('nnoremap', ['T', 's'], 'Unite colorscheme', 'unite-colorschemes', 1) endfunction diff --git a/autoload/SpaceVim/layers/unite.vim b/autoload/SpaceVim/layers/unite.vim index 94050a560..7b4384eff 100644 --- a/autoload/SpaceVim/layers/unite.vim +++ b/autoload/SpaceVim/layers/unite.vim @@ -7,75 +7,35 @@ "============================================================================= function! SpaceVim#layers#unite#plugins() abort + " The default sources: + " file: ff + " register: fe + " jump: fj + " messages: fm let plugins = [ \ ['Shougo/unite.vim',{ 'merged' : 0 , 'loadconf' : 1}], - \ ['Shougo/neoyank.vim'], - \ ['soh335/unite-qflist'], - \ ['SpaceVim/unite-unicode'], - \ ['ujihisa/unite-equery'], - \ ['m2mdas/unite-file-vcs'], - \ ['Shougo/neomru.vim'], - \ ['andreicristianpetcu/vim-van'], - \ ['kmnk/vim-unite-svn'], - \ ['basyura/unite-rails'], - \ ['nobeans/unite-grails'], - \ ['choplin/unite-vim_hacks'], - \ ['mattn/webapi-vim'], - \ ['mattn/gist-vim', {'loadconf' : 1}], - \ ['henices/unite-stock'], - \ ['mattn/wwwrenderer-vim'], - \ ['thinca/vim-openbuf'], - \ ['ujihisa/unite-haskellimport'], - \ ['oppara/vim-unite-cake'], - \ ['thinca/vim-ref', {'loadconf' : 1}], - \ ['heavenshell/unite-zf'], - \ ['heavenshell/unite-sf2'], - \ ['osyo-manga/unite-vimpatches'], - \ ['rhysd/unite-emoji.vim'], - \ ['Shougo/unite-outline'], - \ ['hewes/unite-gtags' ,{'loadconf' : 1}], - \ ['rafi/vim-unite-issue'], - \ ['joker1007/unite-pull-request'], - \ ['tsukkee/unite-tag'], - \ ['ujihisa/unite-launch'], - \ ['ujihisa/unite-gem'], - \ ['osyo-manga/unite-filetype'], - \ ['thinca/vim-unite-history'], - \ ['Shougo/neobundle-vim-recipes'], - \ ['Shougo/unite-help'], - \ ['ujihisa/unite-locate'], - \ ['kmnk/vim-unite-giti'], - \ ['ujihisa/unite-font'], - \ ['t9md/vim-unite-ack'], - \ ['mileszs/ack.vim',{'on_cmd' : 'Ack'}], - \ ['albfan/ag.vim',{'on_cmd' : 'Ag' , 'loadconf' : 1}], - \ ['dyng/ctrlsf.vim',{'on_cmd' : 'CtrlSF', 'on_map' : 'CtrlSF', 'loadconf' : 1 , 'loadconf_before' : 1}], - \ ['daisuzu/unite-adb'], - \ ['osyo-manga/unite-airline_themes'], - \ ['mattn/unite-vim_advent-calendar'], - \ ['mattn/unite-remotefile'], - \ ['sgur/unite-everything'], - \ ['wsdjeg/unite-dwm'], - \ ['raw1z/unite-projects'], - \ ['SpaceVim/unite-ctags'], - \ ['Shougo/unite-session'], - \ ['osyo-manga/unite-quickfix'], - \ ['ujihisa/unite-colorscheme'], - \ ['mattn/unite-gist'], - \ ['tacroe/unite-mark'], - \ ['tacroe/unite-alias'], - \ ['tex/vim-unite-id'], - \ ['sgur/unite-qf'], - \ ['lambdalisue/vim-gista-unite'], - \ ['wsdjeg/unite-radio.vim', {'loadconf' : 1}], - \ ['lambdalisue/unite-grep-vcs', { - \ 'autoload': { - \ 'unite_sources': ['grep/git', 'grep/hg'], - \ }}], - \ ['lambdalisue/vim-gista', { - \ 'on_cmd': 'Gista' - \ }], + \ ['thinca/vim-unite-history', {'merged' : 0}], + \ ['Shougo/unite-help', {'merged' : 0}], + \ ['wsdjeg/unite-radio.vim', {'loadconf' : 1, 'merged' : 0}], \ ] + + " \ ['mileszs/ack.vim',{'on_cmd' : 'Ack'}], + " \ ['albfan/ag.vim',{'on_cmd' : 'Ag' , 'loadconf' : 1}], + " \ ['dyng/ctrlsf.vim',{'on_cmd' : 'CtrlSF', 'on_map' : 'CtrlSF', 'loadconf' : 1 , 'loadconf_before' : 1}], + + " history/yank source fh + call add(plugins, ['Shougo/neoyank.vim', {'merged' : 0}]) + " quickfix source fq + call add(plugins, ['osyo-manga/unite-quickfix', {'merged' : 0}]) + " outline source fo + call add(plugins, ['Shougo/unite-outline', {'merged' : 0}]) + call add(plugins, ['Shougo/neomru.vim', {'merged' : 0}]) + + " This repo merge: + " - https://github.com/sgur/unite-qf locationlist + " - https://github.com/ujihisa/unite-colorscheme colorscheme + " - unicode + call add(plugins, ['SpaceVim/Unite-sources', {'merged' : 0}]) if g:spacevim_enable_googlesuggest call add(plugins, ['mopp/googlesuggest-source.vim']) call add(plugins, ['mattn/googlesuggest-complete-vim']) @@ -98,286 +58,122 @@ endfunction let s:file = expand(':~') let s:unite_lnum = expand('') + 3 function! s:defind_fuzzy_finder() abort - nnoremap fr - \ :Unite -buffer-name=resume resume + nnoremap fr + \ :Unite -buffer-name=resume resume + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.r = ['Unite -buffer-name=resume resume', + \ 'resume unite window', + \ [ + \ '[Leader f r ] is to resume unite window', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + if has('nvim') + nnoremap ff + \ :Unite file_rec/neovim let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings.f.r = ['Unite -buffer-name=resume resume', - \ 'resume unite window', + let g:_spacevim_mappings.f.f = ['Unite file_rec/neovim', + \ 'fuzzy find file', \ [ - \ '[Leader f r ] is to resume unite window', + \ '[Leader f f ] is to fuzzy find file', \ '', \ 'Definition: ' . s:file . ':' . lnum, \ ] \ ] - return - if has('nvim') - nnoremap [unite]f - \ :Unite file_rec/neovim - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.f = ['Unite file_rec/neovim', - \ 'file_rec', - \ [ - \ '[UNITE f ] is to open unite file_rec source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - else - nnoremap [unite]f - \ :Unite file_rec/async - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.f = ['Unite file_rec/async', - \ 'file_rec', - \ [ - \ '[UNITE f ] is to open unite file_rec source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - endif - nnoremap [unite]i - \ :Unite file_rec/git + else + nnoremap ff + \ :Unite file_rec/async let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.i = ['Unite file_rec/git', - \ 'git files', + let g:_spacevim_mappings.f.f = ['Unite file_rec/async', + \ 'fuzzy find file', \ [ - \ '[UNITE f ] is to open unite file_rec source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]g - \ :Unite grep - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.g = ['Unite grep', - \ 'unite grep', - \ [ - \ '[UNITE g ] is to open unite grep source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]u - \ :Unite source - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.u = ['Unite source', - \ 'unite source', - \ [ - \ '[UNITE u ] is to open unite source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]t - \ :Unite tag - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.t = ['Unite tag', - \ 'unite tag', - \ [ - \ '[UNITE t ] is to open unite tag source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]T - \ :Unite tag/include - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.T = ['Unite tag/include', - \ 'unite tag/include', - \ [ - \ '[UNITE T ] is to open unite tag/include source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]l - \ :Unite locationlist - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.l = ['Unite locationlist', - \ 'unite locationlist', - \ [ - \ '[UNITE l ] is to open unite locationlist source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]q - \ :Unite quickfix - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.q = ['Unite quickfix', - \ 'unite quickfix', - \ [ - \ '[UNITE q ] is to open unite quickfix source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]e :Unite - \ -buffer-name=register register - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.e = ['Unite register', - \ 'unite register', - \ [ - \ '[UNITE l ] is to open unite locationlist source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]j - \ :Unite jump - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.j = ['Unite jump', - \ 'unite jump', - \ [ - \ '[UNITE j ] is to open unite jump source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]h - \ :Unite history/yank - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.h = ['Unite history/yank', - \ 'unite history/yank', - \ [ - \ '[UNITE h ] is to open unite history/yank source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite] - \ :UniteWithCursorWord help - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite[''] = ['UniteWithCursorWord help', - \ 'unite with cursor word help', - \ [ - \ '[UNITE ] is to open unite help source for cursor word', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]s - \ :Unite session - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.s = ['Unite session', - \ 'unite session', - \ [ - \ '[UNITE s ] is to open unite session source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]o :Unite -buffer-name=outline - \ -start-insert -auto-preview -split outline - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.o = ['Unite outline', - \ 'unite outline', - \ [ - \ '[UNITE o ] is to open unite outline source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - - " menu - nnoremap [unite]ma - \ :Unite mapping - nnoremap [unite]me - \ :Unite output:message - let lnum = expand('') + s:unite_lnum - 6 - let g:_spacevim_mappings_unite.m = {'name' : '+Menus', - \ 'a' : ['Unite mapping', 'unite mappings', - \ [ - \ '[UNITE m a ] is to open unite mapping menu', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ], - \ 'e' : ['Unite output:message', 'unite messages', - \ [ - \ '[UNITE o ] is to open unite message menu', - \ '', - \ 'Definition: ' . s:file . ':' . (lnum + 2), - \ ] - \ ] - \ } - - nnoremap [unite]c :UniteWithCurrentDir - \ -buffer-name=files buffer bookmark file - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.c = - \ ['UniteWithCurrentDir -buffer-name=files buffer bookmark file', - \ 'unite files in current dir', - \ [ - \ '[UNITE c ] is to open unite outline source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]b :UniteWithBufferDir - \ -buffer-name=files -prompt=%\ buffer bookmark file - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.b = - \ ['UniteWithBufferDir -buffer-name=files' . - \ ' buffer bookmark file', - \ 'unite files in current dir', - \ [ - \ '[UNITE b ] is to open unite buffer and bookmark source with cursor', - \ 'word', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]n - \ :Unite session/new - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite.n = ['Unite session/new', - \ 'unite session/new', - \ [ - \ '[UNITE n ] is to create new vim session', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]/ - \ :Unite grep:. - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite['/'] = ['Unite grep:.', - \ 'unite grep with preview', - \ [ - \ '[UNITE / ] is to open unite grep source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite]w - \ :Unite -buffer-name=files -no-split - \ jump_point file_point buffer_tab - \ file_rec:! file file/new - let lnum = expand('') + s:unite_lnum - 6 - let g:_spacevim_mappings_unite.w= ['Unite -buffer-name=files -no-split' . - \ ' jump_point file_point buffer_tab file_rec:! file file/new', - \ 'unite all file and jump', - \ [ - \ '[UNITE w ] is to open unite jump_point file_point and buffer_tab', - \ 'source', - \ '', - \ 'Definition: ' . s:file . ':' . lnum, - \ ] - \ ] - nnoremap [unite] :Unite -silent -ignorecase -winheight=17 - \ -start-insert menu:CustomKeyMaps - let lnum = expand('') + s:unite_lnum - 4 - let g:_spacevim_mappings_unite['[SPC]'] = ['Unite -silent -ignorecase' . - \ ' -winheight=17 -start-insert menu:CustomKeyMaps', - \ 'unite customkeymaps', - \ [ - \ '[UNITE o ] is to open unite outline source', + \ '[Leader f f ] is to fuzzy find file', \ '', \ 'Definition: ' . s:file . ':' . lnum, \ ] \ ] + endif + nnoremap fe :Unite + \ -buffer-name=register register + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.e = ['Unite register', + \ 'fuzzy find register', + \ [ + \ '[Leader f e] is to fuzzy find content in register', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fh + \ :Unite history/yank + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.h = ['Unite history/yank', + \ 'fuzzy find history/yank', + \ [ + \ '[Leader f h] is to fuzzy find history and yank content', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fj + \ :Unite jump + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.j = ['Unite jump', + \ 'fuzzy find jump list', + \ [ + \ '[Leader f j] is to fuzzy find jump list', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fl + \ :Unite locationlist + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.l = ['Unite locationlist', + \ 'fuzzy find location list', + \ [ + \ '[Leader f l] is to fuzzy find location list', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fm + \ :Unite output:message + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.m = ['Unite output:message', + \ 'fuzzy find message', + \ [ + \ '[Leader f m] is to fuzzy find message', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fq + \ :Unite quickfix + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.q = ['Unite quickfix', + \ 'fuzzy find quickfix list', + \ [ + \ '[Leader f q] is to fuzzy find quickfix list', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + nnoremap fo :Unite -buffer-name=outline + \ -start-insert -auto-preview -split outline + let lnum = expand('') + s:unite_lnum - 4 + let g:_spacevim_mappings.f.o = ['Unite outline', + \ 'fuzzy find outline', + \ [ + \ '[Leader f o] is to fuzzy find outline', + \ '', + \ 'Definition: ' . s:file . ':' . lnum, + \ ] + \ ] + call SpaceVim#mapping#space#def('nnoremap', ['T', 's'], 'Unite colorscheme', 'unite-colorschemes', 1) endfunction + function! s:run_shell_cmd() abort let cmd = input('Please input shell command:', '', 'customlist,SpaceVim#plugins#bashcomplete#complete') if !empty(cmd) diff --git a/autoload/SpaceVim/mapping/leader.vim b/autoload/SpaceVim/mapping/leader.vim index 61c7b8dcf..33a2a7cb6 100644 --- a/autoload/SpaceVim/mapping/leader.vim +++ b/autoload/SpaceVim/mapping/leader.vim @@ -7,57 +7,6 @@ "============================================================================= let s:file = expand(':~') - -function! SpaceVim#mapping#leader#defindglobalMappings() abort - if g:spacevim_enable_insert_leader - inoremap =MyLeaderTabfunc() - endif - - " yark and paste - xnoremap y "+y - xnoremap d "+d - nnoremap p "+p - nnoremap P "+P - xnoremap p "+p - xnoremap P "+P - - cnoremap - - " Location list movement - let g:_spacevim_mappings.l = {'name' : '+Location movement'} - call SpaceVim#mapping#def('nnoremap', 'lj', ':lnext', - \ 'Jump to next location list position', - \ 'lnext', - \ 'Next location list') - call SpaceVim#mapping#def('nnoremap', 'lk', ':lprev', - \ 'Jump to previous location list position', - \ 'lprev', - \ 'Previous location list') - call SpaceVim#mapping#def('nnoremap', 'lq', ':lclose', - \ 'Close the window showing the location list', - \ 'lclose', - \ 'Close location list window') - - " quickfix list movement - let g:_spacevim_mappings.q = {'name' : '+Quickfix movement'} - call SpaceVim#mapping#def('nnoremap', 'qj', ':cnext', - \ 'Jump to next quickfix list position', - \ 'cnext', - \ 'Next quickfix list') - call SpaceVim#mapping#def('nnoremap', 'qk', ':cprev', - \ 'Jump to previous quickfix list position', - \ 'cprev', - \ 'Previous quickfix list') - call SpaceVim#mapping#def('nnoremap', 'qq', ':cclose', - \ 'Close quickfix list window', - \ 'cclose', - \ 'Close quickfix list window') - call SpaceVim#mapping#def('nnoremap ', 'qr', 'q', - \ 'Toggle recording', - \ '', - \ 'Toggle recording mode') -endfunction - let s:lnum = expand('') + 3 function! SpaceVim#mapping#leader#defindWindowsLeader(key) abort if !empty(a:key) diff --git a/config/plugins/ctrlsf.vim b/config/plugins/ctrlsf.vim index 65b879f63..5209ad9b6 100644 --- a/config/plugins/ctrlsf.vim +++ b/config/plugins/ctrlsf.vim @@ -1,7 +1,7 @@ -nmap sf CtrlSFPrompt -vmap sf CtrlSFVwordPath -vmap sF CtrlSFVwordExec -nmap sp CtrlSFPwordPath -nnoremap so :CtrlSFOpen -nnoremap st :CtrlSFToggle -inoremap st :CtrlSFToggle +" nmap sf CtrlSFPrompt +" vmap sf CtrlSFVwordPath +" vmap sF CtrlSFVwordExec +" nmap sp CtrlSFPwordPath +" nnoremap so :CtrlSFOpen +" nnoremap st :CtrlSFToggle +" inoremap st :CtrlSFToggle diff --git a/config/plugins/unite-gtags.vim b/config/plugins/unite-gtags.vim index 727780912..ebd74a631 100644 --- a/config/plugins/unite-gtags.vim +++ b/config/plugins/unite-gtags.vim @@ -1,11 +1,11 @@ "nnoremap gd :execute 'Unite -auto-preview -start-insert -no-split gtags/def:'.expand('') "nnoremap gc :execute 'Unite -auto-preview -start-insert -no-split gtags/context' -nnoremap gr :execute 'Unite -auto-preview -start-insert -no-split gtags/ref' -nnoremap gg :execute 'Unite -auto-preview -start-insert -no-split gtags/grep' +" nnoremap gr :execute 'Unite -auto-preview -start-insert -no-split gtags/ref' +" nnoremap gg :execute 'Unite -auto-preview -start-insert -no-split gtags/grep' "nnoremap gp :execute 'Unite -auto-preview -start-insert -no-split gtags/completion' -vnoremap gd :execute 'Unite -auto-preview -start-insert -no-split gtags/def:'.GetVisualSelection() -let g:unite_source_gtags_project_config = get(g:, 'unite_source_gtags_project_config', { - \ '_': { 'treelize': 0 } - \ }) +" vnoremap gd :execute 'Unite -auto-preview -start-insert -no-split gtags/def:'.GetVisualSelection() +" let g:unite_source_gtags_project_config = get(g:, 'unite_source_gtags_project_config', { + " \ '_': { 'treelize': 0 } + " \ }) " vim:set et sw=2: diff --git a/config/plugins/vim-ref.vim b/config/plugins/vim-ref.vim index a69e802ec..23ac5287b 100644 --- a/config/plugins/vim-ref.vim +++ b/config/plugins/vim-ref.vim @@ -27,10 +27,5 @@ endfunction function! g:ref_source_webdict_sites.wiki.filter(output) return join(split(a:output, "\n")[17 :], "\n") endfunction -nnoremap rj :Ref webdict je -nnoremap re :Ref webdict ej -nnoremap rc :Ref webdict cn -nnoremap rw :Ref webdict wikipedia:en -nnoremap rb :Ref webdict bing " vim:set et sw=2: diff --git a/config/plugins_before/ctrlsf.vim b/config/plugins_before/ctrlsf.vim index beee31478..ebc1f467e 100644 --- a/config/plugins_before/ctrlsf.vim +++ b/config/plugins_before/ctrlsf.vim @@ -1 +1 @@ -nmap sn CtrlSFCwordExec +" nmap sn CtrlSFCwordExec diff --git a/docs/layers/unite.md b/docs/layers/unite.md index f61d75a7a..1767ec4c2 100644 --- a/docs/layers/unite.md +++ b/docs/layers/unite.md @@ -17,29 +17,15 @@ This is a fuzzy finder layer for SpaceVim, and it is based on unite.vim. In Spac ## Key bindings -| Key | Mode | Action | -| ------------------- | :-----------: | ---------------------------------------------------------- | -| `[unite]`+`r` | Normal | Resumes Unite window | -| `[unite]`+`f` | Normal | Opens Unite file recursive search | -| `[unite]`+`i` | Normal | Opens Unite git file search | -| `[unite]`+`g` | Normal | Opens Unite grep with ag (the_silver_searcher) | -| `[unite]`+`u` | Normal | Opens Unite source | -| `[unite]`+`t` | Normal | Opens Unite tag | -| `[unite]`+`T` | Normal | Opens Unite tag/include | -| `[unite]`+`l` | Normal | Opens Unite location list | -| `[unite]`+`q` | Normal | Opens Unite quick fix | -| `[unite]`+`e` | Normal | Opens Unite register | -| `[unite]`+`j` | Normal | Opens Unite jump, change | -| `[unite]`+`h` | Normal | Opens Unite history/yank | -| `[unite]`+`s` | Normal | Opens Unite session | -| `[unite]`+`n` | Normal | Opens Unite session/new | -| `[unite]`+`o` | Normal | Opens Unite outline | -| `[unite]`+`c` | Normal | Opens Unite buffer bookmark file in current directory | -| `[unite]`+`b` | Normal | Opens Unite buffer bookmark file in buffer directory | -| `[unite]`+`ma` | Normal | Opens Unite mapping | -| `[unite]`+`` | Normal | Opens Unite menu:CustomKeyMaps | -| `[unite]`+`me` | Normal | Opens Unite output messages | -| ``+`bl` | Normal | Opens Unite buffers, mru, bookmark | -| ``+`ta` | Normal | Opens Unite tab | -| ``+`ugf` | Normal | Opens Unite file with word at cursor | -| ``+`ugt` | Normal/visual | Opens Unite tag with word at cursor | +| Key bindings | Discription | +| -------------------- | ----------------------------- | +| ` f ` | Fuzzy find menu:CustomKeyMaps | +| ` f e` | Fuzzy find register | +| ` f f` | Fuzzy find file | +| ` f h` | Fuzzy find history/yank | +| ` f j` | Fuzzy find jump, change | +| ` f l` | Fuzzy find location list | +| ` f m` | Fuzzy find output messages | +| ` f o` | Fuzzy find outline | +| ` f q` | Fuzzy find quick fix | +| ` f r` | Resumes Unite window |