summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-10-03 15:21:42 +0000
committerBram Moolenaar <Bram@vim.org>2006-10-03 15:21:42 +0000
commit970cf12a3cd9f775262dbb10b30d3219433e6175 (patch)
tree1525063ebb5f280a2c2a0b1aaf2482a97524b3b6
parent7bd2cd8d19776a26fd692e40c095fcc379194e97 (diff)
downloadvim-git-970cf12a3cd9f775262dbb10b30d3219433e6175.tar.gz
updated for version 7.0-118v7.0.118
-rw-r--r--src/message.c2
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/message.c b/src/message.c
index eebb6db2e..0b0ffa380 100644
--- a/src/message.c
+++ b/src/message.c
@@ -4124,8 +4124,6 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
case 'c':
case 's':
length_modifier = '\0';
- zero_padding = 0; /* turn zero padding off for string
- conversions */
str_arg_l = 1;
switch (fmt_spec)
{
diff --git a/src/version.c b/src/version.c
index 2006cc197..3331694ab 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 */
/**/
+ 118,
+/**/
117,
/**/
116,