keymaps: Drop workaround for fixed unicoder issue

[vimconf.git] / keymaps.vim

diff --git a/keymaps.vim b/keymaps.vim
index 883b3e00eac93e837ba1a748edc13dc61c7fdee3..b56d8db08b9b668292471420588cca4e293589ee 100644 (file)
--- a/keymaps.vim
+++ b/keymaps.vim
@@ -1,6 +1,15 @@
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Global settings
 
+if has('clipboard')
+    " Ordinary ctrl+{c,x,v} using system clipboard register +. We use autocmd to
+    " override plugin keymaps.
+    autocmd VimEnter * vnoremap <C-c> "+y
+    autocmd VimEnter * vnoremap <C-x> "+x
+    autocmd VimEnter * nnoremap <C-v> "+p
+    autocmd VimEnter * inoremap <C-v> <c-r>+
+endif
+
 nnoremap <C-p> :Denite file/rec<cr>
 nnoremap <space>/ :Denite grep:.<cr>
 nnoremap <space>s :Denite buffer<cr>
@@ -56,7 +65,6 @@ au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 
 
 
-
 if filereadable($HOME . '/.vim/keymaps-local.vim')
   source ~/.vim/keymaps-local.vim
 endif