psi-jack/my-yadm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed myspacevim merge bugs

Browse source
This commit is contained in:
Eric Renfro 2022-06-14 13:17:23 -04:00
parent e79c46c978
commit 90abe03c03
2 changed files with 7 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.SpaceVim.d/autoload/myspacevim.vim
View file

@ -1,22 +1,5 @@
function! myspacevim#before() abort
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-e> <End>
@ -26,11 +9,10 @@ endfunction
endfunction
function! myspacevim#after() abort
"set clipboard=unnamedplus
set clipboard=unnamedplus
" inoremap <C-a> <Home>
" inoremap <C-e> <End>
call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 'sbprevious', 1)
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 'sbnext', 1)
call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1)
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1)
endfunction
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec

5
.SpaceVim.d/init.toml
View file

@ -104,11 +104,6 @@
[[layers]]
name = 'lang#vim'
<<<<<<< HEAD
[[custom_plugins]]
name = "saltstack/salt-vim"
=======
#[[custom_plugins]]
#name = "saltstack/salt-vim"
>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec