summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibaut Horel <thibaut.horel@gmail.com>2013-04-01 18:49:50 +0200
committerThibaut Horel <thibaut.horel@gmail.com>2013-04-01 18:49:50 +0200
commit0f1cd5cabd173462d0fadef107e4506f506754c2 (patch)
tree82b8dfd02ded0e0ecf79dd481ec8933783880566
parentf296e7680b2ea96ecc58a872cb714811a3838e09 (diff)
downloaddotfiles-0f1cd5cabd173462d0fadef107e4506f506754c2.tar.gz
[Vim] fix shortcut conflicts
-rw-r--r--.vimrc9
1 files changed, 3 insertions, 6 deletions
diff --git a/.vimrc b/.vimrc
index 226f4b2..e1f4093 100644
--- a/.vimrc
+++ b/.vimrc
@@ -69,8 +69,7 @@ endif
let mapleader = ","
nnoremap <leader><space> :noh<cr>
-nnoremap <tab> %
-vnoremap <tab> %
+nnoremap <S-Tab> %
nnoremap / /\v
vnoremap / /\v
nnoremap <up> <nop>
@@ -83,8 +82,6 @@ inoremap <left> <nop>
inoremap <right> <nop>
nnoremap j gj
nnoremap k gk
-inoremap jk <Esc>
-inoremap kj <Esc>
noremap <F1> <Esc>
noremap gV '[V']
@@ -106,8 +103,8 @@ nnoremap <C-up> <C-w>-
" text bubbling
" vnoremap <C-up> xkP'[V']
-" nnoremap <C-up> ddkP
-" nnoremap <C-down> ddp
+nnoremap <C-S-up> ddkP
+nnoremap <C-S-down> ddp
" vnoremap <C-down> xp'[V']
" folding