To: vim_dev@googlegroups.com
Subject: Patch 8.2.5142
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.5142
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.
Files:      src/testdir/test_startup.vim


*** ../vim-8.2.5141/src/testdir/test_startup.vim	2022-04-12 15:08:36.673207621 +0100
--- src/testdir/test_startup.vim	2022-06-21 14:33:43.943561854 +0100
***************
*** 531,537 ****
        call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry")
        qall
      [CODE]
!     if RunVim([], after, '-f -g -geometry 31x13+41+43')
        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
--- 531,539 ----
        call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry")
        qall
      [CODE]
!     " 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,546 ****
        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])
      endif
    endif
  
--- 541,548 ----
        call assert_inrange(31, 35, str2nr(lines[0]))
        call assert_equal('13', lines[1])
        call assert_equal('41', lines[2])
!       call assert_equal('150', lines[3])
!       call assert_equal('[41, 150]', lines[4])
      endif
    endif
  
*** ../vim-8.2.5141/src/version.c	2022-06-20 13:38:29.166026119 +0100
--- src/version.c	2022-06-21 14:38:02.870205881 +0100
***************
*** 736,737 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     5142,
  /**/

-- 
BEDEVERE: And that, my lord, is how we know the Earth to be banana-shaped.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///