aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/screen.c9
-rw-r--r--src/nvim/testdir/test_signs.vim7
2 files changed, 14 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 92a34dfc42..fddcedf449 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -4518,8 +4518,13 @@ static void get_sign_display_info(
*c_finalp = NUL;
if (nrcol) {
- snprintf((char *)extra, extra_size, "%-*s ",
- number_width(wp), *pp_extra);
+ int n, width = number_width(wp) - 2;
+ for (n = 0; n < width; n++) {
+ extra[n] = ' ';
+ }
+ extra[n] = NUL;
+ STRCAT(extra, *pp_extra);
+ STRCAT(extra, " ");
*pp_extra = extra;
*n_extrap = (int)STRLEN(*pp_extra);
} else {
diff --git a/src/nvim/testdir/test_signs.vim b/src/nvim/testdir/test_signs.vim
index 9d1146453a..48a885c0a1 100644
--- a/src/nvim/testdir/test_signs.vim
+++ b/src/nvim/testdir/test_signs.vim
@@ -1765,6 +1765,7 @@ func Test_sign_numcol()
set signcolumn=number
sign define sign1 text==>
sign place 10 line=1 name=sign1
+ sign define sign2 text=V
redraw!
call assert_equal("=> 01234", s:ScreenLine(1, 1, 8))
@@ -1844,6 +1845,12 @@ func Test_sign_numcol()
redraw!
call assert_equal("=> 01234", s:ScreenLine(1, 1, 8))
call assert_equal(" 2 abcde", s:ScreenLine(2, 1, 8))
+ " Add sign with multi-byte text
+ set numberwidth=4
+ sign place 40 line=2 name=sign2
+ redraw!
+ call assert_equal(" => 01234", s:ScreenLine(1, 1, 9))
+ call assert_equal(" V abcde", s:ScreenLine(2, 1, 9))
sign unplace * group=*
sign undefine sign1