From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 14 Oct 2007 15:16:27 +0000 (+0000)
Subject: updated for version 7.1-140
X-Git-Tag: v7.1.140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f13249a717385d3dd716eb9fa2053aba60d0da62;p=vim

updated for version 7.1-140
---

diff --git a/src/normal.c b/src/normal.c
index fbc430a9f..0b19d5377 100644
--- 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 67a1eef5b..6763d6667 100644
--- 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,
 /**/