changeset 12642:d1cbe8cb05d0 v8.0.1199

patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set commit https://github.com/vim/vim/commit/8bfe07b70878c83c838320cc6a93d62cd78b953f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Oct 15 21:47:05 2017 +0200 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.
author Christian Brabandt <cb@256bit.org>
date Sun, 15 Oct 2017 22:00:05 +0200
parents 36418888cf0c
children f88dfd7fd3bc
files src/ops.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -3259,8 +3259,8 @@ op_yank(oparg_T *oap, int deleting, int 
 
 	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);
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1199,
+/**/
     1198,
 /**/
     1197,