From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 24 Jul 2007 08:45:13 +0000 (+0000)
Subject: updated for version 7.1-034
X-Git-Tag: v7.1.034
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fdec47ab09a8b190c68096c1cd4fca85c0e0e19;p=thirdparty%2Fvim.git

updated for version 7.1-034
---

diff --git a/src/eval.c b/src/eval.c
index e22a61d5a9..6ce7bef76c 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -992,20 +992,20 @@ var_redir_str(value, value_len)
     char_u	*value;
     int		value_len;
 {
-    size_t	len;
+    int		len;
 
     if (redir_lval == NULL)
 	return;
 
     if (value_len == -1)
-	len = STRLEN(value);	/* Append the entire string */
+	len = (int)STRLEN(value);	/* Append the entire string */
     else
-	len = value_len;	/* Append only "value_len" characters */
+	len = value_len;		/* Append only "value_len" characters */
 
-    if (ga_grow(&redir_ga, (int)len) == OK)
+    if (ga_grow(&redir_ga, len) == OK)
     {
 	mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
-	redir_ga.ga_len += (int)len;
+	redir_ga.ga_len += len;
     }
     else
 	var_redir_stop();
diff --git a/src/spell.c b/src/spell.c
index 4e5e7c6e1c..a4c6811727 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -7829,7 +7829,7 @@ put_bytes(fd, nr, len)
 # if (_MSC_VER <= 1200)
 /* This line is required for VC6 without the service pack.  Also see the
  * matching #pragma below. */
-/* # pragma optimize("", off) */
+ #  pragma optimize("", off)
 # endif
 #endif
 
@@ -7859,7 +7859,7 @@ put_sugtime(spin, fd)
 
 #ifdef _MSC_VER
 # if (_MSC_VER <= 1200)
-/* # pragma optimize("", on) */
+ #  pragma optimize("", on)
 # endif
 #endif
 
diff --git a/src/version.c b/src/version.c
index 98ecaf88be..e7d9dacaea 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 */
+/**/
+    34,
 /**/
     33,
 /**/