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().

diff --git a/src/testdir/test_listchars.vim b/src/testdir/test_listchars.vim
index 1e90856a216cbe4e90678e761c321e97170fa4a7..8ddfc7f13b4e4a8757348d53c22eda0d5761fa43 100644 (file)
--- 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 98793c397d07e1fcc65994661b91e466cc16c2a0..80ca8b529ea9ea826a352e0ddcb0e02e96094b65 100644 (file)
--- 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 34b4519bcfa5d5b1f2b63fb6560490aeeb51387a..cb861bc9248c48c4165db0cfd634778615eb0733 100644 (file)
--- 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 6bca45d57e608d5094c8d19ec6743c73f105d17c..d8a65cd3b0965eef244d915eb1b7e975a13fbe59 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1079,
 /**/
     1078,
 /**/