diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-30 15:44:17 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-30 15:44:17 +0100 |
| commit | 48aed0824e47147faf19fc235ad4bcf851584c9c (patch) | |
| tree | 57012170aa54ad65bbd8b5b6e3a2e47ffe158a46 | |
| parent | 5f8069bbf5d989936a2f4d7a76ae42434017e3a2 (diff) | |
patch 8.1.1079: no need for a separate ScreenLinesUtf8() test functionv8.1.1079
Problem: No need for a separate ScreenLinesUtf8() test function.
Solution: Get the composing characters with ScreenLines().
| -rw-r--r-- | src/testdir/test_listchars.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_utf8.vim | 2 | ||||
| -rw-r--r-- | src/testdir/view_util.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 5 insertions, 22 deletions
diff --git a/src/testdir/test_listchars.vim b/src/testdir/test_listchars.vim index 1e90856a21..8ddfc7f13b 100644 --- a/src/testdir/test_listchars.vim +++ b/src/testdir/test_listchars.vim @@ -130,7 +130,7 @@ func Test_listchars_composing() \ ] redraw! call cursor(1, 1) - let got = ScreenLinesUtf8(1, virtcol('$')) + let got = ScreenLines(1, virtcol('$')) bw! call assert_equal(expected, got) let &encoding=oldencoding diff --git a/src/testdir/test_utf8.vim b/src/testdir/test_utf8.vim index 98793c397d..80ca8b529e 100644 --- a/src/testdir/test_utf8.vim +++ b/src/testdir/test_utf8.vim @@ -91,7 +91,7 @@ func Test_screenchar_utf8() call assert_equal("", screenstring(1, 4)) call assert_equal("\u3046\u3099", screenstring(1, 5)) - call assert_equal([text . ' '], ScreenLinesUtf8(1, 8)) + call assert_equal([text . ' '], ScreenLines(1, 8)) bwipe! endfunc diff --git a/src/testdir/view_util.vim b/src/testdir/view_util.vim index 34b4519bcf..cb861bc924 100644 --- a/src/testdir/view_util.vim +++ b/src/testdir/view_util.vim @@ -5,29 +5,10 @@ if exists('*ScreenLines') finish endif -" Get text on the screen, without composing characters. -" ScreenLines(lnum, width) or -" ScreenLines([start, end], width) -function! ScreenLines(lnum, width) abort - redraw! - if type(a:lnum) == v:t_list - let start = a:lnum[0] - let end = a:lnum[1] - else - let start = a:lnum - let end = a:lnum - endif - let lines = [] - for l in range(start, end) - let lines += [join(map(range(1, a:width), 'nr2char(screenchar(l, v:val))'), '')] - endfor - return lines -endfunction - " Get text on the screen, including composing characters. " ScreenLines(lnum, width) or " ScreenLines([start, end], width) -function! ScreenLinesUtf8(lnum, width) abort +function! ScreenLines(lnum, width) abort redraw! if type(a:lnum) == v:t_list let start = a:lnum[0] diff --git a/src/version.c b/src/version.c index 6bca45d57e..d8a65cd3b0 100644 --- a/src/version.c +++ b/src/version.c @@ -776,6 +776,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1079, +/**/ 1078, /**/ 1077, |