From 0f1cd5cabd173462d0fadef107e4506f506754c2 Mon Sep 17 00:00:00 2001
From: Thibaut Horel <thibaut.horel@gmail.com>
Date: Mon, 1 Apr 2013 18:49:50 +0200
Subject: [Vim] fix shortcut conflicts

---
 .vimrc | 9 +++------
 1 file 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
-- 
cgit v1.2.3-70-g09d2