From 6c6a603cd2db9cbd51c9b4e3ff44cbab72b98592 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 25 Jun 2019 05:33:36 +0200
Subject: [PATCH] patch 8.1.1590: popup window test fails

Problem:    Popup window test fails.
Solution:   Add "scrollbar" to expected result.
---
 src/testdir/test_popupwin.vim | 2 ++
 src/version.c                 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 1e8f522c9..b6cef0037 100644
--- 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
index 34af0de9b..5db753ca4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1590,
 /**/
     1589,
 /**/