Mercurial > vim
changeset 14305:8a4c0ab88201 v8.1.0168
patch 8.1.0168: output of :marks is too short with multi-byte chars
commit https://github.com/vim/vim/commit/9d5185bf9dfaef59e47c573a60044a21d5e29c0c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 8 17:57:34 2018 +0200
patch 8.1.0168: output of :marks is too short with multi-byte chars
Problem: Output of :marks is too short with multi-byte chars. (Tony
Mechelynck)
Solution: Get more bytes from the text line.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 08 Jul 2018 18:00:07 +0200 |
| parents | 21ffe3de71b7 |
| children | 006f608a77b5 |
| files | src/mark.c src/testdir/test_marks.vim src/version.c |
| diffstat | 3 files changed, 27 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mark.c +++ b/src/mark.c @@ -686,10 +686,11 @@ mark_line(pos_T *mp, int lead_len) if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count) return vim_strsave((char_u *)"-invalid-"); - s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns); + // Allow for up to 5 bytes per character. + s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns * 5); if (s == NULL) return NULL; - /* Truncate the line to fit it in the window */ + // Truncate the line to fit it in the window. len = 0; for (p = s; *p != NUL; MB_PTR_ADV(p)) {
--- a/src/testdir/test_marks.vim +++ b/src/testdir/test_marks.vim @@ -80,7 +80,7 @@ func Test_marks_cmd() w! b Xone - let a=split(execute('marks'), "\n") + let a = split(execute('marks'), "\n") call assert_equal(9, len(a)) call assert_equal('mark line col file/text', a[0]) call assert_equal(" ' 2 0 bbb", a[1]) @@ -93,7 +93,7 @@ func Test_marks_cmd() call assert_equal(' . 2 0 bbb', a[8]) b Xtwo - let a=split(execute('marks'), "\n") + let a = split(execute('marks'), "\n") call assert_equal(9, len(a)) call assert_equal('mark line col file/text', a[0]) call assert_equal(" ' 1 0 ccc", a[1]) @@ -107,7 +107,7 @@ func Test_marks_cmd() b Xone delmarks aB - let a=split(execute('marks aBcD'), "\n") + let a = split(execute('marks aBcD'), "\n") call assert_equal(2, len(a)) call assert_equal('mark line col file/text', a[0]) call assert_equal(' D 2 0 Xtwo', a[1]) @@ -120,3 +120,22 @@ func Test_marks_cmd() call delete('Xtwo') %bwipe endfunc + +func Test_marks_cmd_multibyte() + if !has('multi_byte') + return + endif + new Xone + call setline(1, ['ááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááá']) + norm! ma + + let a = split(execute('marks a'), "\n") + call assert_equal(2, len(a)) + let expected = ' a 1 0 ' + while strwidth(expected) < &columns - 1 + let expected .= 'á' + endwhile + call assert_equal(expected, a[1]) + + bwipe! +endfunc