From 1de50acc41fb39bb08da97d0d32e945d6e412bb2 Mon Sep 17 00:00:00 2001 From: Jack Bracewell Date: Fri, 17 Mar 2017 17:30:18 +0000 Subject: vim-patch:7.4.2292 (#6304) Problem: Not all systems understand %F in printf(). Solution: Use %f. https://github.com/vim/vim/commit/965ed14973fd3f1b2aace7bae4d4722b71ca04f9 --- src/nvim/strings.c | 2 +- src/nvim/version.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 0dc27061f4..7768636ded 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -1228,7 +1228,7 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap, l += snprintf(format + 1, sizeof(format) - 1, ".%d", (int)precision); } - format[l] = fmt_spec; + format[l] = fmt_spec == 'F' ? 'f' : fmt_spec; format[l + 1] = NUL; assert(l + 1 < (int)sizeof(format)); str_arg_l = (size_t)snprintf(tmp, sizeof(tmp), format, f); diff --git a/src/nvim/version.c b/src/nvim/version.c index 1a7e11952f..dd401b83aa 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -148,7 +148,7 @@ static int included_patches[] = { 2295, 2294, // 2293, - // 2292, + 2292, // 2291, // 2290 NA // 2289 NA -- cgit