summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-29 14:48:14 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-29 14:48:14 +0000
commit4100af7840a735cced72f1d20121850cea150a0d (patch)
tree06e135f1c92bca18febcf6ec16e637468e177f31
parente8c3a1408b51ea18ba29d70f4939df1d3e26ee76 (diff)
downloadvim-4100af7840a735cced72f1d20121850cea150a0d.zip
updated for version 7.0-069
-rw-r--r--src/buffer.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 6ffa1cb14..3359bc240 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3324,7 +3324,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
{
usefmt = eval_to_string_safe(fmt + 2, NULL, use_sandbox);
if (usefmt == NULL)
- usefmt = (char_u *)"";
+ usefmt = fmt;
}
#endif
diff --git a/src/version.c b/src/version.c
index cfbf39d5b..851ac3373 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 */
/**/
+ 69,
+/**/
68,
/**/
67,