Merge remote-tracking branch 'upstream/master' into aucmd_textputpostaucmd_textputpost

1 files changed, 0 insertions, 64 deletions

diff --git a/src/nvim/testdir/view_util.vim b/src/nvim/testdir/view_util.vim
deleted file mode 100644
index a4d0e56af9..0000000000
--- a/src/nvim/testdir/view_util.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" Functions about view shared by several tests
-
-" Only load this script once.
-if exists('*Screenline')
-  finish
-endif
-
-" Get line "lnum" as displayed on the screen.
-" Trailing white space is trimmed.
-func Screenline(lnum)
-  let chars = []
-  for c in range(1, winwidth(0))
-    call add(chars, nr2char(screenchar(a:lnum, c)))
-  endfor
-  let line = join(chars, '')
-  return matchstr(line, '^.\{-}\ze\s*$')
-endfunc
-
-" Get text on the screen, including composing characters.
-" ScreenLines(lnum, width) or
-" ScreenLines([start, end], width)
-func 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), 'screenstring(l, v:val)'), '')]
-  endfor
-  return lines
-endfunc
-
-func ScreenAttrs(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 attrs = []
-  for l in range(start, end)
-    let attrs += [map(range(1, a:width), 'screenattr(l, v:val)')]
-  endfor
-  return attrs
-endfunc
-
-func NewWindow(height, width) abort
-  exe a:height . 'new'
-  exe a:width . 'vsp'
-  set winfixwidth winfixheight
-  redraw!
-endfunc
-
-func CloseWindow() abort
-  bw!
-  redraw!
-endfunc