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

Fixed myspacevim merge bugs

This commit is contained in:
Eric Renfro 2022-06-14 13:17:23 -04:00
parent 880ea76474
commit dba8e47e70
Signed by: psi-jack
GPG Key ID: 14977F3A50D9A5BF
2 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.SpaceVim.d/autoload/myspacevim.vim
View File

@ -1,36 +1,18 @@
function! myspacevim#before() abort
set clipboard=unnamedplus
<<<<<<< HEAD
#inoremap <C-a> <Home>
#inoremap <C-e> <End>
" 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)
" 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>
" 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>
"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', 'sbprevious', 1)
call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', '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