diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/runtest.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 436ef72f61..c606cacd2d 100644 --- 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 fbc1db9e9f..aa44fb0dde 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1839, +/**/ 1838, /**/ 1837, |