From 53b5dde20c29488a6ea7d667720cef0003a0403d Mon Sep 17 00:00:00 2001
From: ssfdust <ssfdust@gmail.com>
Date: Fri, 27 Oct 2017 17:53:15 +0800
Subject: [PATCH] resolve conflicts between tmux layer and edit layer

---
 autoload/SpaceVim/layers/edit.vim  | 4 ++--
 autoload/SpaceVim/layers/tmux.vim  | 3 +--
 autoload/SpaceVim/layers/tools.vim | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/autoload/SpaceVim/layers/edit.vim b/autoload/SpaceVim/layers/edit.vim
index 95c7a6570..6c6510c10 100644
--- a/autoload/SpaceVim/layers/edit.vim
+++ b/autoload/SpaceVim/layers/edit.vim
@@ -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
diff --git a/autoload/SpaceVim/layers/tmux.vim b/autoload/SpaceVim/layers/tmux.vim
index 1db4ec4d3..5ba1b5f14 100644
--- a/autoload/SpaceVim/layers/tmux.vim
+++ b/autoload/SpaceVim/layers/tmux.vim
@@ -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
diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim
index 0c7877e20..56ee1f712 100644
--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@@ -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>