vim-patch:8.1.1079: no need for a separate ScreenLinesUtf8() test function

Problem:    No need for a separate ScreenLinesUtf8() test function.
Solution:   Get the composing characters with ScreenLines().
https://github.com/vim/vim/commit/48aed0824e47147faf19fc235ad4bcf851584c9c

2 files changed, 2 insertions, 20 deletions

diff --git a/src/nvim/testdir/test_utf8.vim b/src/nvim/testdir/test_utf8.vim
index acf15e0e28..735efac36d 100644
--- a/src/nvim/testdir/test_utf8.vim
+++ b/src/nvim/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/nvim/testdir/view_util.vim b/src/nvim/testdir/view_util.vim
index dd143c02c1..1cdce21602 100644
--- a/src/nvim/testdir/view_util.vim
+++ b/src/nvim/testdir/view_util.vim
@@ -16,28 +16,10 @@ func Screenline(lnum)
   return matchstr(line, '^.\{-}\ze\s*$')
 endfunc
 
-" 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]