summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2007-07-24 08:45:13 +0000
committervimboss <devnull@localhost>2007-07-24 08:45:13 +0000
commitf20065947cf6b8eb719d722af3d9ed1940b19df5 (patch)
treee663370c8999e466598c3e5fe74b9efd4ae8e5bd
parent5788cfa282a1bfbd8ebe2563085a923372d9c73e (diff)
downloadvim-f20065947cf6b8eb719d722af3d9ed1940b19df5.tar.gz
updated for version 7.1-034v7.1.034v7-1-034
-rw-r--r--src/eval.c10
-rw-r--r--src/spell.c4
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 7 deletions
diff --git a/src/eval.c b/src/eval.c
index e22a61d5..6ce7bef7 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 4e5e7c6e..a4c68117 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 98ecaf88..e7d9daca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 34,
+/**/
33,
/**/
32,