summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-04-01 16:28:38 +0200
committerBram Moolenaar <Bram@vim.org>2011-04-01 16:28:38 +0200
commit337ae06ff9fe42c871564947aa32e4fe6b08fba9 (patch)
tree33c6242b77e6881b2e3543840609bcb01c0eb1c4
parent27b6056d85370f13c4e156d83d095676357ba34a (diff)
updated for version 7.3.151v7.3.151
Problem: When "unnamedplus" is in 'clipboard' the selection is sometimes also copied to the star register. Solution: Avoid copy to the star register when undesired. (James Vega)
-rw-r--r--src/ops.c3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ops.c b/src/ops.c
index c529cd262e..c41f84456b 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3148,10 +3148,9 @@ op_yank(oap, deleting, mess)
/* Copy the text from register 0 to the clipboard register. */
copy_yank_reg(&(y_regs[PLUS_REGISTER]));
- /* No need to copy to * register upon 'unnamed' now - see below */
clip_own_selection(&clip_plus);
clip_gen_set_selection(&clip_plus);
- if (!clip_isautosel() && !did_star)
+ if (!clip_isautosel() && !did_star && curr == &(y_regs[PLUS_REGISTER]))
{
copy_yank_reg(&(y_regs[STAR_REGISTER]));
clip_own_selection(&clip_star);
diff --git a/src/version.c b/src/version.c
index 63ddf68a22..b50a21dfbb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 151,
+/**/
150,
/**/
149,