updated for version 7.1-140

diff --git a/src/normal.c b/src/normal.c
index fbc430a9f76f3b2b463519cd1a758a4eb7e5f53a..0b19d537716b1e00e8a670dc13b54a178fcad440 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -690,6 +690,13 @@ getcount:
                ca.count0 = ca.count0 * 10 + (c - '0');
            if (ca.count0 < 0)      /* got too large! */
                ca.count0 = 999999999L;
+#ifdef FEAT_EVAL
+           /* Set v:count here, when called from main() and not a stuffed
+            * command, so that v:count can be used in an expression mapping
+            * right after the count. */
+           if (toplevel && stuff_empty())
+               set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
+#endif
            if (ctrl_w)
            {
                ++no_mapping;

diff --git a/src/version.c b/src/version.c
index 67a1eef5b7b3f961c4211f4bfde4fb1634ca9871..6763d6667da0862c61b8c9ab28bfcb30964f75b8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    140,
 /**/
     139,
 /**/