Fixed myspacevim merge bugs
This commit is contained in:
parent
e2ff9a2f99
commit
e190aa0235
2 changed files with 7 additions and 30 deletions
|
@ -1,22 +1,5 @@
|
||||||
function! myspacevim#before() abort
|
function! myspacevim#before() abort
|
||||||
set clipboard=unnamedplus
|
set clipboard=unnamedplus
|
||||||
<<<<<<< HEAD
|
|
||||||
#inoremap <C-a> <Home>
|
|
||||||
#inoremap <C-e> <End>
|
|
||||||
|
|
||||||
#call SpaceVim#custom#SPCGroupName(['b'], '+MyCustom')
|
|
||||||
#call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1)
|
|
||||||
#call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! myspacevim#after() abort
|
|
||||||
set clipboard=unnamedplus
|
|
||||||
#inoremap <C-a> <Home>
|
|
||||||
#inoremap <C-e> <End>
|
|
||||||
call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1)
|
|
||||||
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1)
|
|
||||||
endfunction
|
|
||||||
=======
|
|
||||||
" inoremap <C-a> <Home>
|
" inoremap <C-a> <Home>
|
||||||
" inoremap <C-e> <End>
|
" inoremap <C-e> <End>
|
||||||
|
|
||||||
|
@ -26,11 +9,10 @@ endfunction
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! myspacevim#after() abort
|
function! myspacevim#after() abort
|
||||||
"set clipboard=unnamedplus
|
set clipboard=unnamedplus
|
||||||
" inoremap <C-a> <Home>
|
" inoremap <C-a> <Home>
|
||||||
" inoremap <C-e> <End>
|
" inoremap <C-e> <End>
|
||||||
call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 'sbprevious', 1)
|
call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1)
|
||||||
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 'sbnext', 1)
|
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1)
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
|
|
||||||
|
|
|
@ -104,11 +104,6 @@
|
||||||
[[layers]]
|
[[layers]]
|
||||||
name = 'lang#vim'
|
name = 'lang#vim'
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
[[custom_plugins]]
|
[[custom_plugins]]
|
||||||
name = "saltstack/salt-vim"
|
name = "saltstack/salt-vim"
|
||||||
=======
|
|
||||||
#[[custom_plugins]]
|
|
||||||
#name = "saltstack/salt-vim"
|
|
||||||
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue