Mercurial > vim
changeset 3914:f15769bce0b8 v7.3.713
updated for version 7.3.713
Problem: printf() can only align to bytes, not characters.
Solution: Add the "S" item. (Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 14 Nov 2012 18:10:56 +0100 |
| parents | 57e8b75298d6 |
| children | 51ba8061b6d2 |
| files | runtime/doc/eval.txt src/message.c src/version.c |
| diffstat | 3 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -4451,6 +4451,7 @@ printf({fmt}, {expr1} ...) *printf()* Often used items are: %s string + %6S string right-aligned in 6 display cells %6s string right-aligned in 6 bytes %.9s string truncated to 9 bytes %c single byte @@ -4565,6 +4566,10 @@ printf({fmt}, {expr1} ...) *printf()* s The text of the String argument is used. If a precision is specified, no more bytes than the number specified are used. + S The text of the String argument is used. If a + precision is specified, no more display cells than the + number specified are used. Without the |+multi_byte| + feature works just like 's'. *printf-f* *E807* f The Float argument is converted into a string of the
--- a/src/message.c +++ b/src/message.c @@ -4290,6 +4290,7 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3 case '%': case 'c': case 's': + case 'S': length_modifier = '\0'; str_arg_l = 1; switch (fmt_spec) @@ -4318,6 +4319,7 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3 } case 's': + case 'S': str_arg = #ifndef HAVE_STDARG_H (char *)get_a_arg(arg_idx); @@ -4354,6 +4356,24 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3 str_arg_l = (q == NULL) ? precision : (size_t)(q - str_arg); } +#ifdef FEAT_MBYTE + if (fmt_spec == 'S') + { + if (min_field_width != 0) + min_field_width += STRLEN(str_arg) + - mb_string2cells((char_u *)str_arg, -1); + if (precision) + { + char_u *p1 = (char_u *)str_arg; + size_t i; + + for (i = 0; i < precision && *p1; i++) + p1 += mb_ptr2len(p1); + + str_arg_l = precision = p1 - (char_u *)str_arg; + } + } +#endif break; default: