From 84298db3a43838da9ca2c7289fbe34428604fec4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 20 Apr 2012 13:46:08 +0200 Subject: [PATCH] updated for version 7.3.498 Problem: The behavior of the "- register changes depending on value of the 'clipboard' option. (Szamotulski) Solution: Also set the "- register when the register is "*" or "+". (Christian Brabandt) --- src/ops.c | 11 ++++++++--- src/version.c | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ops.c b/src/ops.c index 146c990c68..bccac77904 100644 --- a/src/ops.c +++ b/src/ops.c @@ -1720,9 +1720,14 @@ op_delete(oap) did_yank = TRUE; } - /* Yank into small delete register when no register specified and the - * delete is within one line. */ - if (oap->regname == 0 && oap->motion_type != MLINE + /* Yank into small delete register when no named register specified + * and the delete is within one line. */ + if (( +#ifdef FEAT_CLIPBOARD + ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || + ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || +#endif + oap->regname == 0) && oap->motion_type != MLINE && oap->line_count == 1) { oap->regname = '-'; diff --git a/src/version.c b/src/version.c index b2f26a9ba4..ed92464a4f 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 498, /**/ 497, /**/ -- 2.47.3