summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ops.c11
-rw-r--r--src/version.c2
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
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 498,
+/**/
497,
/**/
496,