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)

diff --git a/src/ops.c b/src/ops.c
index 146c990c68ed8c41908a9c2891695089d3abe20e..bccac779043d339c64b77ec299746640dabaa377 100644 (file)
--- 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 b2f26a9ba418df5010cb907f4a6226f162d0ce28..ed92464a4fcb34dbc4b64fc318373046b3ccee67 100644 (file)
--- 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,
 /**/