Mercurial > vim
changeset 13956:300aab3275c0 v8.0.1848
patch 8.0.1848: 'termwinscroll' does not work properly
commit https://github.com/vim/vim/commit/4d6cd291cec668b991f2b43d76c6feab8b2e7d98
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue May 15 23:53:26 2018 +0200
patch 8.0.1848: 'termwinscroll' does not work properly
Problem: 'termwinscroll' does not work properly. (Dominique Pelle)
Solution: Subtract removed scrollback from the scrollback count. Add a test
for 'termwinscroll'. (closes #2909)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 16 May 2018 00:00:12 +0200 |
| parents | 842f6d962a49 |
| children | 23aa3c207b82 |
| files | src/terminal.c src/testdir/test_terminal.vim src/version.c |
| diffstat | 3 files changed, 31 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/terminal.c +++ b/src/terminal.c @@ -46,6 +46,7 @@ * - Win32: Redirecting output works but includes escape sequences. * - Win32: Make terminal used for :!cmd in the GUI work better. Allow for * redirection. + * - terminal API: Add more functionality? (Ozaki Kiichi 2018 May 13, #2907) * - When the job only outputs lines, we could handle resizing the terminal * better: store lines separated by line breaks, instead of screen lines, * then when the window is resized redraw those lines. @@ -2727,6 +2728,7 @@ handle_pushline(int cols, const VTermScr mch_memmove(term->tl_scrollback.ga_data, (sb_line_T *)term->tl_scrollback.ga_data + todo, sizeof(sb_line_T) * term->tl_scrollback.ga_len); + term->tl_scrollback_scrolled -= todo; } if (ga_grow(&term->tl_scrollback, 1) == OK)
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1507,3 +1507,30 @@ func Test_terminal_out_err() call delete('Xechoerrout.sh') call delete(outfile) endfunc + +func Test_terminwinscroll() + if !has('unix') + return + endif + + " Let the terminal output more than 'termwinscroll' lines, some at the start + " will be dropped. + exe 'set termwinscroll=' . &lines + let buf = term_start('/bin/sh') + for i in range(1, &lines) + call feedkeys("echo " . i . "\<CR>", 'xt') + call WaitForAssert({-> assert_match(string(i), term_getline(buf, term_getcursor(buf)[0] - 1))}) + endfor + " Go to Terminal-Normal mode to update the buffer. + call feedkeys("\<C-W>N", 'xt') + call assert_inrange(&lines, &lines * 110 / 100 + winheight(0), line('$')) + + " Every "echo nr" must only appear once + let lines = getline(1, line('$')) + for i in range(&lines - len(lines) / 2 + 2, &lines) + let filtered = filter(copy(lines), {idx, val -> val =~ 'echo ' . i . '\>'}) + call assert_equal(1, len(filtered), 'for "echo ' . i . '"') + endfor + + exe buf . 'bwipe!' +endfunc