# HG changeset patch
# User vimboss
# Date 1159888902 0
# Node ID 144ad7f25f6741815c8297fe77965f93ee359c2a
# Parent  ddafd2ba3a863054041f2f71248f0ea91fc3b1d2
updated for version 7.0-118

diff --git a/src/message.c b/src/message.c
--- a/src/message.c
+++ b/src/message.c
@@ -4124,8 +4124,6 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3
 	    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
--- 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,