patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set

Problem:    When 'clipboard' is "autoselectplus" the star register is also
            set. (Gilles Moris)
Solution:   Don't set the star register in this situation.

diff --git a/src/ops.c b/src/ops.c
index 6fb6947ee20c36ccf58607b35e849a74ecbd53ab..e366903c7115ecde1e6df7cc3641f019b2ae7721 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -3259,8 +3259,8 @@ op_yank(oparg_T *oap, int deleting, int mess)
 
        clip_own_selection(&clip_plus);
        clip_gen_set_selection(&clip_plus);
-       if (!clip_isautosel_star() && !did_star
-                                         && curr == &(y_regs[PLUS_REGISTER]))
+       if (!clip_isautosel_star() && !clip_isautosel_plus()
+               && !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 0fbb99e36c88ec92f86d7ca1bfeb910f1cf80bb3..5baff489a8a2174d02922900c4d1286b76a96eff 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1199,
 /**/
     1198,
 /**/