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 #12111)

diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 7b775fe00f4c45835b103bbe42c5113aa633e13d..03d29ae97bec335c75198d1a9bf2b8815f993944 100644 (file)
--- 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;

diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index b3b90d142901ca55fd715ae6073933e0dcbd7edd..e1b5622a8b2c905b7167f9b34c7de736f0e87ad7 100644 (file)
--- 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
 

diff --git a/src/version.c b/src/version.c
index 4288f31a352cc27106523d67c22f50ae14785b0a..994ddb9a8c078d52285c4247c992550e37a51dea 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1386,
 /**/
     1385,
 /**/