diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-08-09 21:04:43 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-08-09 21:04:43 -0400 |
| commit | ef6451a11329c2e60764e9e17fadcec4e82f08f3 (patch) | |
| tree | 8e5eab3a5b79f0811bcfb261fdda2d771533ab41 /runtime/autoload | |
| parent | 5a195858657e1c494e77ea868073d2f3664cdb60 (diff) | |
| parent | 41e9ebcf41d6cba830254ffa9e089df21b22acf8 (diff) | |
| download | rneovim-ef6451a11329c2e60764e9e17fadcec4e82f08f3.tar.gz rneovim-ef6451a11329c2e60764e9e17fadcec4e82f08f3.tar.bz2 rneovim-ef6451a11329c2e60764e9e17fadcec4e82f08f3.zip | |
Merge #3141 'handle clipboard=unnamedplus,unnamed correctly'.
Diffstat (limited to 'runtime/autoload')
| -rw-r--r-- | runtime/autoload/provider/clipboard.vim | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim index d20b3a9bf1..5d1ce7896d 100644 --- a/runtime/autoload/provider/clipboard.vim +++ b/runtime/autoload/provider/clipboard.vim @@ -55,13 +55,21 @@ endif let s:clipboard = {} function! s:clipboard.get(reg) - if s:selections[a:reg].owner > 0 - return s:selections[a:reg].data + let reg = a:reg == '"' ? '+' : a:reg + if s:selections[reg].owner > 0 + return s:selections[reg].data end - return s:try_cmd(s:paste[a:reg]) + return s:try_cmd(s:paste[reg]) endfunction function! s:clipboard.set(lines, regtype, reg) + if a:reg == '"' + call s:clipboard.set(a:lines,a:regtype,'+') + if s:copy['*'] != s:copy['+'] + call s:clipboard.set(a:lines,a:regtype,'*') + end + return 0 + end if s:cache_enabled == 0 call s:try_cmd(s:copy[a:reg], a:lines) return 0 |