diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-07-13 10:11:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 10:11:30 +0200 |
| commit | be531aba777a28c476c4632c094ab65a7f14e8bc (patch) | |
| tree | 22ef3f81a9ab4d2fb3dc50975defae1dadaba40c /runtime | |
| parent | 5ea4d58a1b1d3d0cafe5da5ebe4dd64908a2a73c (diff) | |
| parent | 6ea2bde065016d4cb2600aa2252daa83f66f09c4 (diff) | |
| download | rneovim-be531aba777a28c476c4632c094ab65a7f14e8bc.tar.gz rneovim-be531aba777a28c476c4632c094ab65a7f14e8bc.tar.bz2 rneovim-be531aba777a28c476c4632c094ab65a7f14e8bc.zip | |
Merge pull request #5042 from bfredl/unnamedunnamedplus
clipboard: make v:register=='+' when clipboard=unnamed,unnamedplus
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/provider/clipboard.vim | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim index 77bc8c781d..0f4aa78ddd 100644 --- a/runtime/autoload/provider/clipboard.vim +++ b/runtime/autoload/provider/clipboard.vim @@ -65,11 +65,10 @@ endif let s:clipboard = {} function! s:clipboard.get(reg) - let reg = a:reg == '"' ? '+' : a:reg - if s:selections[reg].owner > 0 - return s:selections[reg].data + if s:selections[a:reg].owner > 0 + return s:selections[a:reg].data end - return s:try_cmd(s:paste[reg]) + return s:try_cmd(s:paste[a:reg]) endfunction function! s:clipboard.set(lines, regtype, reg) |