changeset 2749:f169a51f7ead v7.3.151

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)
author Bram Moolenaar <bram@vim.org>
date Fri, 01 Apr 2011 16:28:38 +0200
parents e5ef158a7e36
children 66fe19b3c59a
files src/ops.c src/version.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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,