diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-10-15 21:47:05 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-10-15 21:47:05 +0200 |
commit | 8bfe07b70878c83c838320cc6a93d62cd78b953f (patch) | |
tree | 72164ac5ae7121b4f72b20d8e0e6f2fdb7a40a15 /src | |
parent | 00ce63dc230b6c8f55997b09396aee6d6d722734 (diff) |
patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is setv8.0.1199
Problem: When 'clipboard' is "autoselectplus" the star register is also
set. (Gilles Moris)
Solution: Don't set the star register in this situation.
Diffstat (limited to 'src')
-rw-r--r-- | src/ops.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -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 0fbb99e36c..5baff489a8 100644 --- 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, |