From a893593a9f54a0fbe84b467d43f11a841ecae2ee Mon Sep 17 00:00:00 2001 From: Aufar Gilbran Date: Fri, 2 Oct 2020 14:10:18 +0800 Subject: vim-patch:8.2.1488: text does not scroll when inserting above first line Problem: Text does not scroll when inserting above first line. Solution: Adjust off-by-one error. (Ken Takata, closes vim/vim#6739) https://github.com/vim/vim/commit/9dc1917f42b23277e143fc58bbe27482b0b76bad --- src/nvim/screen.c | 2 +- src/nvim/testdir/test_display.vim | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/screen.c b/src/nvim/screen.c index fdd191163d..7c42f29a90 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -902,7 +902,7 @@ static void win_update(win_T *wp) if (mod_top != 0 && wp->w_topline == mod_top && (!wp->w_lines[0].wl_valid - || wp->w_topline == wp->w_lines[0].wl_lnum)) { + || wp->w_topline <= wp->w_lines[0].wl_lnum)) { // w_topline is the first changed line and window is not scrolled, // the scrolling from changed lines will be done further down. } else if (wp->w_lines[0].wl_valid diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim index 98f6b17ccd..e853b046dc 100644 --- a/src/nvim/testdir/test_display.vim +++ b/src/nvim/testdir/test_display.vim @@ -208,3 +208,16 @@ func Test_visual_block_scroll() call StopVimInTerminal(buf) call delete(filename) endfunc + +func Test_display_scroll_at_topline() + " See test/functional/legacy/display_spec.lua + CheckScreendump + + let buf = RunVimInTerminal('', #{cols: 20}) + call term_sendkeys(buf, ":call setline(1, repeat('a', 21))\") + call term_wait(buf) + call term_sendkeys(buf, "O\") + call VerifyScreenDump(buf, 'Test_display_scroll_at_topline', #{rows: 4}) + + call StopVimInTerminal(buf) +endfunc -- cgit