From fa04eae5a5b9394079bde2d37ce6f9f8a5567d48 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 21 Jun 2022 14:38:40 +0100 Subject: [PATCH] patch 8.2.5142: startup test fails if there is a status bar Problem: Startup test fails if there is a status bar at the top of the screen. (Ernie Rael) Solution: Use a larger vertical offset in the test. --- src/testdir/test_startup.vim | 8 +++++--- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index c580dd0e4..2908ab663 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -531,7 +531,9 @@ func Test_geometry() call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry") qall [CODE] - if RunVim([], after, '-f -g -geometry 31x13+41+43') + " Some window managers have a bar at the top that pushes windows down, + " need to use at least 130, let's do 150 + if RunVim([], after, '-f -g -geometry 31x13+41+150') let lines = readfile('Xtest_geometry') " Depending on the GUI library and the windowing system the final size " might be a bit different, allow for some tolerance. Tuned based on @@ -539,8 +541,8 @@ func Test_geometry() call assert_inrange(31, 35, str2nr(lines[0])) call assert_equal('13', lines[1]) call assert_equal('41', lines[2]) - call assert_equal('43', lines[3]) - call assert_equal('[41, 43]', lines[4]) + call assert_equal('150', lines[3]) + call assert_equal('[41, 150]', lines[4]) endif endif diff --git a/src/version.c b/src/version.c index 99522846c..36eadfdb5 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5142, /**/ 5141, /**/ -- 2.50.0