keymaps: Use + or * regs for clipboard

[vimconf.git] / keymaps.vim

diff --git a/keymaps.vim b/keymaps.vim
index 234ee91746f3b735ce918958f0c793f5feec912d..bf0597d1661f1c9ea0dc8d5fea16b0ca5f11915a 100644 (file)
--- a/keymaps.vim
+++ b/keymaps.vim
@@ -2,12 +2,20 @@
 " Global settings
 
 if has('clipboard')
+    " Use + or * registers
+    if has('unnamedplus')
+        set clipboard+=unnamedplus
+    else
+        set clipboard+=unnamed
+    endif
+
     " 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 * vnoremap <C-c> "+y
+    "autocmd VimEnter * vnoremap <C-x> "+x
+    " Is performed by S+Ins
     "autocmd VimEnter * nnoremap <C-v> "+p
-    autocmd VimEnter * inoremap <C-v> <c-r>+
+    "autocmd VimEnter * inoremap <C-v> <c-r>+
 endif
 
 " ctrl+d as EOF exits shells and the like. Add a keymap for the same here.