aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/screen.c2
-rw-r--r--src/nvim/testdir/test_display.vim13
2 files changed, 14 insertions, 1 deletions
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))\<CR>")
+ call term_wait(buf)
+ call term_sendkeys(buf, "O\<Esc>")
+ call VerifyScreenDump(buf, 'Test_display_scroll_at_topline', #{rows: 4})
+
+ call StopVimInTerminal(buf)
+endfunc