From 8bfe07b70878c83c838320cc6a93d62cd78b953f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 15 Oct 2017 21:47:05 +0200 Subject: [PATCH] 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. --- src/ops.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ops.c b/src/ops.c index 6fb6947ee..e366903c7 100644 --- 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 0fbb99e36..5baff489a 100644 --- 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, /**/ -- 2.50.1