# HG changeset patch # User Bram Moolenaar # Date 1541971805 -3600 # Node ID f3b4cd98944cfc4018cf6825c7b84043f65bc1c7 # Parent 67c54109768a8a6f6d56cc6127c95792ccef0953 patch 8.1.0522: :terminal does not show trailing empty lines commit https://github.com/vim/vim/commit/f3aea59afa23304266dfd0dd26b5d8cc70a21331 Author: Bram Moolenaar Date: Sun Nov 11 22:18:21 2018 +0100 patch 8.1.0522: :terminal does not show trailing empty lines Problem: :terminal does not show trailing empty lines. Solution: Add empty lines. (Hirohito Higashi, closes https://github.com/vim/vim/issues/3605) diff --git a/src/terminal.c b/src/terminal.c --- a/src/terminal.c +++ b/src/terminal.c @@ -1592,6 +1592,15 @@ update_snapshot(term_T *term) } } + // Add trailing empty lines. + for (pos.row = term->tl_scrollback.ga_len; + pos.row < term->tl_scrollback_scrolled + term->tl_cursor_pos.row; + ++pos.row) + { + if (add_empty_scrollback(term, &fill_attr, 0) == OK) + add_scrollback_line_to_buffer(term, (char_u *)"", 0); + } + term->tl_dirty_snapshot = FALSE; #ifdef FEAT_TIMERS term->tl_timer_set = FALSE; diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1658,3 +1658,25 @@ func Test_terminal_hidden_and_close() call WaitForAssert({-> assert_false(bufexists(bnr))}) call assert_equal(1, winnr('$')) endfunc + +func Test_terminal_does_not_truncate_last_newlines() + let cmd = has('win32') ? 'type' : 'cat' + let contents = [ + \ [ 'One', '', 'X' ], + \ [ 'Two', '', '' ], + \ [ 'Three' ] + repeat([''], 30) + \ ] + + for c in contents + call writefile(c, 'Xfile') + exec 'term' cmd 'Xfile' + let bnr = bufnr('$') + call assert_equal('terminal', getbufvar(bnr, '&buftype')) + call WaitForAssert({-> assert_equal('finished', term_getstatus(bnr))}) + sleep 50m + call assert_equal(c, getline(1, line('$'))) + quit + endfor + + call delete('Xfile') +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 522, +/**/ 521, /**/ 520,