keymaps: Drop workaround for fixed unicoder issue

[vimconf.git] / keymaps.vim

diff --git a/keymaps.vim b/keymaps.vim
index 9f9f6aa1f6c534dd13bb480e3446eadca8b81ce9..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>
@@ -54,8 +63,6 @@ au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
 
-" Add :imap to :map of plugin
-imap <C-l> <Plug>Unicoder
 
 
 if filereadable($HOME . '/.vim/keymaps-local.vim')