patch 8.1.2083: multi-byte chars do not work properly with "%.*S" in printf()
Problem: Multi-byte chars do not work properly with "%.*S" in printf().
Solution: Use mb_ptr2cells(). Daniel Hahler, closes #4989)
diff --git a/src/message.c b/src/message.c
index b407534..dd5f3f5 100644
--- a/src/message.c
+++ b/src/message.c
@@ -4405,12 +4405,16 @@
- mb_string2cells((char_u *)str_arg, -1);
if (precision)
{
- char_u *p1 = (char_u *)str_arg;
- size_t i;
+ char_u *p1;
+ size_t i = 0;
- for (i = 0; i < precision && *p1; i++)
- p1 += mb_ptr2len(p1);
-
+ for (p1 = (char_u *)str_arg; *p1;
+ p1 += mb_ptr2len(p1))
+ {
+ i += (size_t)mb_ptr2cells(p1);
+ if (i > precision)
+ break;
+ }
str_arg_l = precision = p1 - (char_u *)str_arg;
}
}
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index 365a813..253cd49 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -248,6 +248,9 @@
call assert_equal('abc ', printf('%-4s', 'abc'))
call assert_equal('abc ', printf('%-4S', 'abc'))
+ call assert_equal('🐍', printf('%.2S', '🐍🐍'))
+ call assert_equal('', printf('%.1S', '🐍🐍'))
+
call assert_equal('1%', printf('%d%%', 1))
endfunc
diff --git a/src/version.c b/src/version.c
index fa4e956..98ddcca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2083,
+/**/
2082,
/**/
2081,