]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.151 v7.3.151
authorBram Moolenaar <Bram@vim.org>
Fri, 1 Apr 2011 14:28:38 +0000 (16:28 +0200)
committerBram Moolenaar <Bram@vim.org>
Fri, 1 Apr 2011 14:28:38 +0000 (16:28 +0200)
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
src/version.c

index c529cd262efd3dc810fb7e5f3950dcb51010d44c..c41f84456bd9dcc83bacd3557e8b8db601da0c20 100644 (file)
--- 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);
index 63ddf68a226bd30b8da2bfad84f6f82e23e77287..b50a21dfbb45f1c4cd1cce89037248b1a992394a 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    151,
 /**/
     150,
 /**/