diff options
| author | Jack Bracewell <FriedSock@users.noreply.github.com> | 2017-03-17 17:30:18 +0000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-17 18:30:18 +0100 |
| commit | 1de50acc41fb39bb08da97d0d32e945d6e412bb2 (patch) | |
| tree | d8a8a5f7010f973e7d73485d44cc5540a08c6759 | |
| parent | 147e115dd9bb9d28504ba22f5e63c188957646a0 (diff) | |
| download | rneovim-1de50acc41fb39bb08da97d0d32e945d6e412bb2.tar.gz rneovim-1de50acc41fb39bb08da97d0d32e945d6e412bb2.tar.bz2 rneovim-1de50acc41fb39bb08da97d0d32e945d6e412bb2.zip | |
vim-patch:7.4.2292 (#6304)
Problem: Not all systems understand %F in printf().
Solution: Use %f.
https://github.com/vim/vim/commit/965ed14973fd3f1b2aace7bae4d4722b71ca04f9
| -rw-r--r-- | src/nvim/strings.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 |