# HG changeset patch # User Bram Moolenaar # Date 1546893008 -3600 # Node ID 317846db300a8c71f21ee1834f06ad11d4aef994 # Parent 14161b8381420227275f0ba1b53277b75f23b4ac patch 8.1.0701: sign message not translated and inconsistent spacing commit https://github.com/vim/vim/commit/d730c8e2974609034016ca66db09d2ef78784343 Author: Bram Moolenaar Date: Mon Jan 7 21:16:53 2019 +0100 patch 8.1.0701: sign message not translated and inconsistent spacing Problem: Sign message not translated and inconsistent spacing. Solution: Add _() for translation. Add a space. (Ken Takata) Also use MSG_BUF_LEN instead of BUFSIZ. diff --git a/src/sign.c b/src/sign.c --- a/src/sign.c +++ b/src/sign.c @@ -607,8 +607,8 @@ sign_list_placed(buf_T *rbuf, char_u *si { buf_T *buf; signlist_T *sign; - char lbuf[BUFSIZ]; - char group[BUFSIZ]; + char lbuf[MSG_BUF_LEN]; + char group[MSG_BUF_LEN]; MSG_PUTS_TITLE(_("\n--- Signs ---")); msg_putchar('\n'); @@ -620,7 +620,7 @@ sign_list_placed(buf_T *rbuf, char_u *si { if (buf->b_signlist != NULL) { - vim_snprintf(lbuf, BUFSIZ, _("Signs for %s:"), buf->b_fname); + vim_snprintf(lbuf, MSG_BUF_LEN, _("Signs for %s:"), buf->b_fname); MSG_PUTS_ATTR(lbuf, HL_ATTR(HLF_D)); msg_putchar('\n'); } @@ -631,12 +631,12 @@ sign_list_placed(buf_T *rbuf, char_u *si if (!sign_in_group(sign, sign_group)) continue; if (sign->group != NULL) - vim_snprintf(group, BUFSIZ, " group=%s", + vim_snprintf(group, MSG_BUF_LEN, _(" group=%s"), sign->group->sg_name); else group[0] = '\0'; - vim_snprintf(lbuf, BUFSIZ, _(" line=%ld id=%d%s name=%s " - "priority=%d"), + vim_snprintf(lbuf, MSG_BUF_LEN, + _(" line=%ld id=%d%s name=%s priority=%d"), (long)sign->lnum, sign->id, group, sign_typenr2name(sign->typenr), sign->priority); MSG_PUTS(lbuf); diff --git a/src/testdir/test_signs.vim b/src/testdir/test_signs.vim --- a/src/testdir/test_signs.vim +++ b/src/testdir/test_signs.vim @@ -67,7 +67,7 @@ func Test_sign() " Check placed signs let a=execute('sign place') call assert_equal("\n--- Signs ---\nSigns for [NULL]:\n" . - \ " line=3 id=41 name=Sign1 priority=10\n", a) + \ " line=3 id=41 name=Sign1 priority=10\n", a) " Unplace the sign and try jumping to it again should fail. sign unplace 41 @@ -95,7 +95,7 @@ func Test_sign() sign place 77 line=9 name=Sign2 let a=execute('sign place') call assert_equal("\n--- Signs ---\nSigns for [NULL]:\n" . - \ " line=9 id=77 name=Sign2 priority=10\n", a) + \ " line=9 id=77 name=Sign2 priority=10\n", a) sign unplace * " Check :jump with file=... @@ -161,7 +161,7 @@ func Test_sign() exe 'sign place 20 line=3 name=004 buffer=' . bufnr('') let a = execute('sign place') call assert_equal("\n--- Signs ---\nSigns for foo:\n" . - \ " line=3 id=20 name=4 priority=10\n", a) + \ " line=3 id=20 name=4 priority=10\n", a) exe 'sign unplace 20 buffer=' . bufnr('') sign undefine 004 call assert_fails('sign list 4', 'E155:') @@ -189,7 +189,7 @@ func Test_sign_undefine_still_placed() " Listing placed sign should show that sign is deleted. let a=execute('sign place') call assert_equal("\n--- Signs ---\nSigns for foobar:\n" . - \ " line=1 id=41 name=[Deleted] priority=10\n", a) + \ " line=1 id=41 name=[Deleted] priority=10\n", a) sign unplace 41 let a=execute('sign place') @@ -613,19 +613,19 @@ func Test_sign_group() " :sign place file={fname} let a = execute('sign place file=Xsign') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 name=sign1 priority=10\n", a) + \ " line=10 id=5 name=sign1 priority=10\n", a) " :sign place group={group} file={fname} let a = execute('sign place group=g2 file=Xsign') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 group=g2 name=sign1 priority=10\n", a) + \ " line=10 id=5 group=g2 name=sign1 priority=10\n", a) " :sign place group=* file={fname} let a = execute('sign place group=* file=Xsign') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 group=g2 name=sign1 priority=10\n" . - \ " line=10 id=5 group=g1 name=sign1 priority=10\n" . - \ " line=10 id=5 name=sign1 priority=10\n", a) + \ " line=10 id=5 group=g2 name=sign1 priority=10\n" . + \ " line=10 id=5 group=g1 name=sign1 priority=10\n" . + \ " line=10 id=5 name=sign1 priority=10\n", a) " Error case: non-existing group let a = execute('sign place group=xyz file=Xsign') @@ -640,19 +640,19 @@ func Test_sign_group() " :sign place buffer={fname} let a = execute('sign place buffer=' . bnum) call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 name=sign1 priority=10\n", a) + \ " line=10 id=5 name=sign1 priority=10\n", a) " :sign place group={group} buffer={fname} let a = execute('sign place group=g2 buffer=' . bnum) call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=12 id=5 group=g2 name=sign1 priority=10\n", a) + \ " line=12 id=5 group=g2 name=sign1 priority=10\n", a) " :sign place group=* buffer={fname} let a = execute('sign place group=* buffer=' . bnum) call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 name=sign1 priority=10\n" . - \ " line=11 id=5 group=g1 name=sign1 priority=10\n" . - \ " line=12 id=5 group=g2 name=sign1 priority=10\n", a) + \ " line=10 id=5 name=sign1 priority=10\n" . + \ " line=11 id=5 group=g1 name=sign1 priority=10\n" . + \ " line=12 id=5 group=g2 name=sign1 priority=10\n", a) " Error case: non-existing group let a = execute('sign place group=xyz buffer=' . bnum) @@ -661,19 +661,19 @@ func Test_sign_group() " :sign place let a = execute('sign place') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 name=sign1 priority=10\n", a) + \ " line=10 id=5 name=sign1 priority=10\n", a) " :sign place group={group} let a = execute('sign place group=g1') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=11 id=5 group=g1 name=sign1 priority=10\n", a) + \ " line=11 id=5 group=g1 name=sign1 priority=10\n", a) " :sign place group=* let a = execute('sign place group=*') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 name=sign1 priority=10\n" . - \ " line=11 id=5 group=g1 name=sign1 priority=10\n" . - \ " line=12 id=5 group=g2 name=sign1 priority=10\n", a) + \ " line=10 id=5 name=sign1 priority=10\n" . + \ " line=11 id=5 group=g1 name=sign1 priority=10\n" . + \ " line=12 id=5 group=g2 name=sign1 priority=10\n", a) " Test for ':sign jump' command with groups sign jump 5 group=g1 file=Xsign @@ -1128,14 +1128,14 @@ func Test_sign_priority() sign place 5 group=g2 line=10 name=sign1 priority=25 file=Xsign let a = execute('sign place group=*') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 name=sign1 priority=30\n" . - \ " line=10 id=5 group=g2 name=sign1 priority=25\n" . - \ " line=10 id=5 group=g1 name=sign1 priority=20\n", a) + \ " line=10 id=5 name=sign1 priority=30\n" . + \ " line=10 id=5 group=g2 name=sign1 priority=25\n" . + \ " line=10 id=5 group=g1 name=sign1 priority=20\n", a) " Test for :sign place group={group} let a = execute('sign place group=g1') call assert_equal("\n--- Signs ---\nSigns for Xsign:\n" . - \ " line=10 id=5 group=g1 name=sign1 priority=20\n", a) + \ " line=10 id=5 group=g1 name=sign1 priority=20\n", a) call sign_unplace('*') call sign_undefine() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 701, +/**/ 700, /**/ 699,