From 337ae06ff9fe42c871564947aa32e4fe6b08fba9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 1 Apr 2011 16:28:38 +0200 Subject: updated for version 7.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) --- src/ops.c | 3 +-- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ops.c b/src/ops.c index c529cd262..c41f84456 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 63ddf68a2..b50a21dfb 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 151, /**/ 150, /**/ -- cgit v1.2.1