patch 8.1.1839: insufficient info when test fails because of screen size

Problem:    Insufficient info when test fails because of screen size.
Solution:   Report the detected screen size.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 436ef72f61394b1ed057013d5fe369e30baba476..c606cacd2dd646b132fd92952fabe74392f11487 100644 (file)
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -34,12 +34,14 @@ so small.vim
 
 " Check that the screen size is at least 24 x 80 characters.
 if &lines < 24 || &columns < 80 
-  let error = 'Screen size too small! Tests require at least 24 lines with 80 characters'
+  let error = 'Screen size too small! Tests require at least 24 lines with 80 characters, got ' .. &lines .. ' lines with ' .. &columns .. ' characters'
   echoerr error
   split test.log
   $put =error
   write
   split messages
+  call append(line('$'), '')
+  call append(line('$'), 'From ' . expand('%') . ':')
   call append(line('$'), error)
   write
   qa!
@@ -170,7 +172,7 @@ func RunTheTest(test)
     endtry
   endif
 
-  " Clear any autocommands
+  " Clear any autocommands and put back the catch-all for SwapExists.
   au!
   au SwapExists * call HandleSwapExists()
 

diff --git a/src/version.c b/src/version.c
index fbc1db9e9fe329ba98bdaa82d8fda2990fe9b176..aa44fb0dde6db0961589ee93343dd22ac724f9f4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1839,
 /**/
     1838,
 /**/