# HG changeset patch # User Bram Moolenaar # Date 1561514404 -7200 # Node ID 4c009ec23c0a624ef2b134659fd7992bf3eb32e7 # Parent dcfddf7094959bd51b7dd9a1707a120fed7d911e patch 8.1.1598: update to test file missing commit https://github.com/vim/vim/commit/53a95d65840e9d48844fa0798f198eca765176e8 Author: Bram Moolenaar Date: Wed Jun 26 03:54:08 2019 +0200 patch 8.1.1598: update to test file missing Problem: Update to test file missing. Solution: Update the popup window test file. diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -134,6 +134,7 @@ func Test_popup_with_border_and_padding( \ 'core_width': 12, \ 'height': 3, \ 'core_height': 1, + \ 'firstline': 1, \ 'scrollbar': 0, \ 'visible': 1} let winid = popup_create('hello border', {'line': 2, 'col': 3, 'border': []})", @@ -173,6 +174,7 @@ func Test_popup_with_border_and_padding( \ 'height': 5, \ 'scrollbar': 0, \ 'core_height': 1, + \ 'firstline': 1, \ 'visible': 1}, popup_getpos(winid)) call popup_clear() @@ -1426,6 +1428,13 @@ func Test_popup_scrollbar() \ 'minwidth': 8, \ 'maxheight': 4, \ }) + func ScrollUp() + call feedkeys("\\", "xt") + endfunc + func ScrollDown() + call feedkeys("\\", "xt") + endfunc + map :call test_setmouse(5, 36) END call writefile(lines, 'XtestPopupScroll') let buf = RunVimInTerminal('-S XtestPopupScroll', {'rows': 10}) @@ -1440,6 +1449,16 @@ func Test_popup_scrollbar() call term_sendkeys(buf, ":call popup_setoptions(winid, {'firstline': 9})\") call VerifyScreenDump(buf, 'Test_popupwin_scroll_4', {}) + call term_sendkeys(buf, ":call ScrollUp()\") + call VerifyScreenDump(buf, 'Test_popupwin_scroll_5', {}) + + call term_sendkeys(buf, ":call ScrollDown()\") + call VerifyScreenDump(buf, 'Test_popupwin_scroll_6', {}) + + call term_sendkeys(buf, ":call ScrollDown()\") + call term_sendkeys(buf, ":call ScrollDown()\") + call VerifyScreenDump(buf, 'Test_popupwin_scroll_7', {}) + " clean up call StopVimInTerminal(buf) call delete('XtestPopupScroll') diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1598, +/**/ 1597, /**/ 1596,