summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-29 22:31:24 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-29 22:31:24 +0200
commit965ed14973fd3f1b2aace7bae4d4722b71ca04f9 (patch)
tree1157086fa31c19ac76842ff34b5e4df0d7a5786a
parent04186095346daa60e82e981dad114de2b641d672 (diff)
patch 7.4.2292v7.4.2292
Problem: Not all systems understand %F in printf(). Solution: Use %f.
-rw-r--r--src/message.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index 264d15a121..90c4ffb12b 100644
--- a/src/message.c
+++ b/src/message.c
@@ -4797,7 +4797,7 @@ vim_vsnprintf(
precision = max_prec;
l += sprintf(format + l, ".%d", (int)precision);
}
- format[l] = fmt_spec;
+ format[l] = fmt_spec == 'F' ? 'f' : fmt_spec;
format[l + 1] = NUL;
str_arg_l = sprintf(tmp, format, f);
diff --git a/src/version.c b/src/version.c
index 0d97662fb9..7ff66d3aae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2292,
+/**/
2291,
/**/
2290,