1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-23 13:00:04 +08:00

Compare commits

...

2 Commits

3 changed files with 8 additions and 8 deletions

View File

@ -261,7 +261,6 @@ function! SpaceVim#layers#core#config() abort
nnoremap <silent> <F3> <cmd>NeoTreeFocusToggle<CR> nnoremap <silent> <F3> <cmd>NeoTreeFocusToggle<CR>
endif endif
let g:matchup_matchparen_status_offscreen = 0 let g:matchup_matchparen_status_offscreen = 0
let g:smoothie_no_default_mappings = !s:enable_smooth_scrolling
" Unimpaired bindings " Unimpaired bindings
" Quickly add empty lines " Quickly add empty lines
nnoremap <silent> [<Space> :<c-u>put! =repeat(nr2char(10), v:count1)<cr> nnoremap <silent> [<Space> :<c-u>put! =repeat(nr2char(10), v:count1)<cr>
@ -1204,6 +1203,7 @@ function! SpaceVim#layers#core#set_variable(var) abort
let s:enable_smooth_scrolling = get(a:var, let s:enable_smooth_scrolling = get(a:var,
\ 'enable_smooth_scrolling', \ 'enable_smooth_scrolling',
\ s:enable_smooth_scrolling) \ s:enable_smooth_scrolling)
let g:smoothie_no_default_mappings = !s:enable_smooth_scrolling
let g:_spacevim_enable_filetree_filetypeicon = get(a:var, let g:_spacevim_enable_filetree_filetypeicon = get(a:var,
\ 'enable_filetree_filetypeicon', \ 'enable_filetree_filetypeicon',
\ g:_spacevim_enable_filetree_filetypeicon) \ g:_spacevim_enable_filetree_filetypeicon)

View File

@ -110,7 +110,7 @@ function! SpaceVim#layers#edit#plugins() abort
\ [g:_spacevim_root_dir . 'bundle/vim-textobj-entire'], \ [g:_spacevim_root_dir . 'bundle/vim-textobj-entire'],
\ [g:_spacevim_root_dir . 'bundle/wildfire.vim',{'on_map' : '<Plug>(wildfire-'}], \ [g:_spacevim_root_dir . 'bundle/wildfire.vim',{'on_map' : '<Plug>(wildfire-'}],
\ [g:_spacevim_root_dir . 'bundle/editorconfig-vim', { 'merged' : 0, 'if' : has('python') || has('python3')}], \ [g:_spacevim_root_dir . 'bundle/editorconfig-vim', { 'merged' : 0, 'if' : has('python') || has('python3')}],
\ [g:_spacevim_root_dir . 'bundle/vim-jplus', { 'on_map' : '<Plug>(jplus' }], \ [g:_spacevim_root_dir . 'bundle/vim-jplus', { 'on_map' : '<Plug>(jplus', 'loadconf_before' : 1 }],
\ [g:_spacevim_root_dir . 'bundle/tabular', { 'merged' : 0, 'on_cmd' : ['Tabularize']}], \ [g:_spacevim_root_dir . 'bundle/tabular', { 'merged' : 0, 'on_cmd' : ['Tabularize']}],
\ [g:_spacevim_root_dir . 'bundle/splitjoin.vim',{ 'on_cmd':['SplitjoinJoin', 'SplitjoinSplit'],'merged' : 0, 'loadconf' : 1}], \ [g:_spacevim_root_dir . 'bundle/splitjoin.vim',{ 'on_cmd':['SplitjoinJoin', 'SplitjoinSplit'],'merged' : 0, 'loadconf' : 1}],
\ ] \ ]
@ -185,12 +185,6 @@ function! SpaceVim#layers#edit#config() abort
vnoremap <C-SPACE> <Plug>(wildfire-water) vnoremap <C-SPACE> <Plug>(wildfire-water)
let g:wildfire_objects = ["i'", 'i"', 'i)', 'i]', 'i}', 'ip', 'it'] let g:wildfire_objects = ["i'", 'i"', 'i)', 'i]', 'i}', 'ip', 'it']
" osyo-manga/vim-jplus {{{
nmap <silent> J <Plug>(jplus)
vmap <silent> J <Plug>(jplus)
" }}}
if s:CMP.has('python3') || s:CMP.has('python') if s:CMP.has('python3') || s:CMP.has('python')
nnoremap <silent> <F7> :MundoToggle<CR> nnoremap <silent> <F7> :MundoToggle<CR>
else else

View File

@ -0,0 +1,6 @@
if index(get(g:, 'spacevim_disabled_plugins', []), 'vim-jplus') != 0
" osyo-manga/vim-jplus {{{
nmap <silent> J <Plug>(jplus)
vmap <silent> J <Plug>(jplus)
" }}}
endif