summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-26 18:04:54 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-26 18:04:54 +0200
commit8da41816316f17382817df3f9449b55df8d39651 (patch)
tree38947619934e8b08519fc26075b26a3845bf65d0
parent4cd583c6da08ce2f87e1c07b6490a74bb3c3d0c0 (diff)
downloadvim-git-8da41816316f17382817df3f9449b55df8d39651.tar.gz
patch 8.1.1601: missing changes to popup window test filev8.1.1601
Problem: Missing changes to popup window test file. Solution: Add those changes.
-rw-r--r--src/testdir/test_popupwin.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index f65abe46e..e80621b37 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1423,6 +1423,8 @@ func Test_popup_scrollbar()
let lines =<< trim END
call setline(1, range(1, 20))
+ hi ScrollThumb ctermbg=blue
+ hi ScrollBar ctermbg=red
let winid = popup_create(['one', 'two', 'three', 'four', 'five',
\ 'six', 'seven', 'eight', 'nine'], {
\ 'minwidth': 8,
@@ -1449,6 +1451,7 @@ func Test_popup_scrollbar()
call term_sendkeys(buf, ":call popup_setoptions(winid, {'firstline': 9})\<CR>")
call VerifyScreenDump(buf, 'Test_popupwin_scroll_4', {})
+ call term_sendkeys(buf, ":call popup_setoptions(winid, {'scrollbarhighlight': 'ScrollBar', 'thumbhighlight': 'ScrollThumb'})\<CR>")
call term_sendkeys(buf, ":call ScrollUp()\<CR>")
call VerifyScreenDump(buf, 'Test_popupwin_scroll_5', {})
diff --git a/src/version.c b/src/version.c
index b34071ea3..55c62dfde 100644
--- 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 */
/**/
+ 1601,
+/**/
1600,
/**/
1599,