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 /src | |
| 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 'src')
| -rw-r--r-- | src/nvim/ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 8a7ced138b..766b5720d9 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -5278,11 +5278,11 @@ static yankreg_T *adjust_clipboard_name(int *name, bool quiet) } yankreg_T *target; if (cb_flags & CB_UNNAMEDPLUS) { - *name = '+'; - target = &y_regs[STAR_REGISTER]; + *name = cb_flags & CB_UNNAMED ? '"': '+'; + target = &y_regs[PLUS_REGISTER]; } else { *name = '*'; - target = &y_regs[PLUS_REGISTER]; + target = &y_regs[STAR_REGISTER]; } return target; // unnamed register } |