1
0
forked from aniani/vim

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.
This commit is contained in:
Bram Moolenaar
2022-06-21 14:38:40 +01:00
parent 155f2d1451
commit fa04eae5a5
2 changed files with 7 additions and 3 deletions

View File

@@ -531,7 +531,9 @@ func Test_geometry()
call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry") call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry")
qall qall
[CODE] [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') let lines = readfile('Xtest_geometry')
" Depending on the GUI library and the windowing system the final size " Depending on the GUI library and the windowing system the final size
" might be a bit different, allow for some tolerance. Tuned based on " 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_inrange(31, 35, str2nr(lines[0]))
call assert_equal('13', lines[1]) call assert_equal('13', lines[1])
call assert_equal('41', lines[2]) call assert_equal('41', lines[2])
call assert_equal('43', lines[3]) call assert_equal('150', lines[3])
call assert_equal('[41, 43]', lines[4]) call assert_equal('[41, 150]', lines[4])
endif endif
endif endif

View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5142,
/**/ /**/
5141, 5141,
/**/ /**/