# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1561434305 -7200
# Node ID a47ea7d2fe6d5484531999cd5e73db893a5013a0
# Parent  249a79cc1d4a2844ae5d1a4d554c93b568804cd5
patch 8.1.1590: popup window test fails

commit https://github.com/vim/vim/commit/6c6a603cd2db9cbd51c9b4e3ff44cbab72b98592
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jun 25 05:33:36 2019 +0200

    patch 8.1.1590: popup window test fails

    Problem:    Popup window test fails.
    Solution:   Add "scrollbar" to expected result.

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,
+	\ 'scrollbar': 0,
 	\ 'visible': 1}
   let winid = popup_create('hello border', {'line': 2, 'col': 3, 'border': []})",
   call assert_equal(with_border_or_padding, popup_getpos(winid))
@@ -170,6 +171,7 @@ func Test_popup_with_border_and_padding(
 	\ 'width': 14,
 	\ 'core_width': 10,
 	\ 'height': 5,
+	\ 'scrollbar': 0,
 	\ 'core_height': 1,
 	\ 'visible': 1}, popup_getpos(winid))
 
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 */
 /**/
+    1590,
+/**/
     1589,
 /**/
     1588,