Patch 9.0.1386

[Bram Moolenaar]

Patch 9.0.1386
Problem: Options test fails with some window width.
Solution: Adjust what text the test checks with. (closes #12111)
Files: src/testdir/test_normal.vim, src/testdir/test_options.vim


*** ../vim-9.0.1385/src/testdir/test_normal.vim 2023-03-05 21:15:02.456536894 +0000
--- src/testdir/test_normal.vim 2023-03-06 08:03:01.516097933 +0000
***************
*** 2526,2533 ****
--- 2526,2536 ----
norm! g'a
call assert_equal('>', a[-1:])
call assert_equal(1, line('.'))
+ let v:errmsg = ''
call assert_nobeep("normal! g`\<Esc>")
+ call assert_equal('', v:errmsg)
call assert_nobeep("normal! g'\<Esc>")
+ call assert_equal('', v:errmsg)

" Test for g; and g,
norm! g;
*** ../vim-9.0.1385/src/testdir/test_options.vim 2023-03-02 18:36:30.272804170 +0000
--- src/testdir/test_options.vim 2023-03-06 08:08:18.883634740 +0000
***************
*** 1058,1065 ****
exe "normal \<C-c>"
call assert_equal('Beep!', Screenline(&lines))
call assert_equal('line 4:', Screenline(&lines - 1))
! " only match the final colon in the line that shows the source
! call assert_match(':$', Screenline(&lines - 2))
set debug&
endfunc

--- 1058,1066 ----
exe "normal \<C-c>"
call assert_equal('Beep!', Screenline(&lines))
call assert_equal('line 4:', Screenline(&lines - 1))
! " also check a line above, with a certain window width the colon is there
! call assert_match('Test_debug_option:$',
! \ Screenline(&lines - 3) .. Screenline(&lines - 2))
set debug&
endfunc

*** ../vim-9.0.1385/src/version.c 2023-03-05 21:15:02.456536894 +0000
--- src/version.c 2023-03-06 08:04:22.515980209 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1386,
/**/

--
hundred-and-one symptoms of being an internet addict:
232. You start conversations with, "Have you gotten a fiber connection?"

/// Bram Moolenaar -- Br...@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 ///