Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-03 09:20:04 +08:00
Code Issues Projects Releases Wiki Activity

resolve conflicts between tmux layer and edit layer

Browse Source
This commit is contained in:
ssfdust 2017-10-27 17:53:15 +08:00
parent b9b2fa95f2
commit 53b5dde20c
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/SpaceVim/layers/edit.vim
View File

@ -29,8 +29,8 @@ function! SpaceVim#layers#edit#plugins() abort
endfunction
function! SpaceVim#layers#edit#config() abort
let g:multi_cursor_next_key=get(g:, 'multi_cursor_next_key', '<C-j>')
let g:multi_cursor_prev_key=get(g:, 'multi_cursor_prev_key', '<C-k>')
let g:multi_cursor_next_key=get(g:, 'multi_cursor_next_key', '<C-n>')
let g:multi_cursor_prev_key=get(g:, 'multi_cursor_prev_key', '<C-u>')
let g:multi_cursor_skip_key=get(g:, 'multi_cursor_skip_key', '<C-x>')
let g:multi_cursor_quit_key=get(g:, 'multi_cursor_quit_key', '<Esc>')
let g:user_emmet_install_global = 0

3
autoload/SpaceVim/layers/tmux.vim
View File

@ -5,8 +5,7 @@
" seamlessly.
" This layer is not added by default. To include it, add
" `SpaceVim#layers#load('tmux')` to your `~/.SpaceVim.d/init.vim`.
" This layer currently overwrites some SpaceVim keybinds including multiple
" cursors. If you are having issues with <C-h> in a neovim buffer, see
" If you are having issues with <C-h> in a neovim buffer, see
" `https://github.com/neovim/neovim/issues/2048#issuecomment-78045837`
"
" @subsection mappings

8
autoload/SpaceVim/layers/tools.vim
View File

@ -66,11 +66,11 @@ function! SpaceVim#layers#tools#config() abort
" List of colors that you do not want. ANSI code or #RRGGBB
let g:rainbow#blacklist = [233, 234]
nnoremap <Leader>fz :FZF<CR>
if maparg('<C-l>', 'v') ==# ''
vnoremap <silent> <C-l> <Esc>:Ydv<CR>
if maparg('<C-_>', 'v') ==# ''
vnoremap <silent> <C-_> <Esc>:Ydv<CR>
endif
if maparg('<C-l>', 'n') ==# ''
nnoremap <silent> <C-l> <Esc>:Ydc<CR>
if maparg('<C-_>', 'n') ==# ''
nnoremap <silent> <C-_> <Esc>:Ydc<CR>
endif
map <Leader>td <Plug>TaskList
noremap <silent> <F8> :TlistToggle<CR>