changeset 17182:a47ea7d2fe6d v8.1.1590

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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 25 Jun 2019 05:45:05 +0200
parents 249a79cc1d4a
children 694c578dedd2
files src/testdir/test_popupwin.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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))
 
--- 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,