changeset 32110:66961c678d8a v9.0.1386

patch 9.0.1386: options test fails with some window width Commit: https://github.com/vim/vim/commit/30585e03a7ce6cf985f93ca30275bf4dae0d87cc Author: zeertzjq <zeertzjq@outlook.com> Date: Mon Mar 6 08:10:04 2023 +0000 patch 9.0.1386: options test fails with some window width Problem: Options test fails with some window width. Solution: Adjust what text the test checks with. (closes https://github.com/vim/vim/issues/12111)
author Bram Moolenaar <Bram@vim.org>
date Mon, 06 Mar 2023 09:15:05 +0100
parents 717cbacce38c
children fac01409848f
files src/testdir/test_normal.vim src/testdir/test_options.vim src/version.c
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -2526,8 +2526,11 @@ func Test_normal33_g_cmd2()
   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;
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -1058,8 +1058,9 @@ func Test_debug_option()
   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))
+  " 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
 
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1386,
+/**/
     1385,
 /**/
     1384,