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
index 1e8f522c91b7506b3707ce0316512d10e77b11d5..b6cef00370799780ad259b87bd827683c8145b86 100644 (file)
--- 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 34af0de9b1c18bc3a443b15fb91b9eac9e82d6c6..5db753ca4c8e19e0c28329d8b25d43f6ef5d23d5 100644 (file)
--- 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,
 /**/