updated for version 7.4.033

Problem:    When the terminal has only 20 lines test 92 and 93 overwrite the
            input file.
Solution:   Explicitly write test.out. Check that the terminal is large enough
            to run the tests.  (Hirohito Higashi)

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 0be46fe1ba143f136edb6b835656c22260a5f3f2..f736d54d9e75ce3ae05d54461d05998f1a6d8e2a 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -58,9 +58,13 @@ clean:
        -rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
 
 test1.out: test1.in
-       -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START)
+       -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
        $(RUN_VIM) $*.in
-       @/bin/sh -c "if diff test.out $*.ok; \
+       @/bin/sh -c "if test -e wrongtermsize; \
+               then echo; \
+               echo test1 FAILED - terminal size must be 80x24 or larger; \
+               echo; exit 1; \
+               elif diff test.out $*.ok; \
                then mv -f test.out $*.out; \
                else echo; \
                echo test1 FAILED - Something basic is wrong; \

diff --git a/src/testdir/test1.in b/src/testdir/test1.in
index c175fa590e5498e8065ad55aba1f65914724f6cd..735d53967327856b00ad405be67dfccba52e0eeb 100644 (file)
--- a/src/testdir/test1.in
+++ b/src/testdir/test1.in
@@ -18,6 +18,10 @@ Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
 Similar logic is applied to the +lua feature, using lua.vim.
 
 STARTTEST
+:" If columns or lines are too small, create wrongtermsize.
+:" (Some tests will fail. When columns and/or lines are small)
+:if &lines < 24 || &columns < 80 | sp another | w! wrongtermsize | qa! | endif
+:"
 :" Write a single line to test.out to check if testing works at all.
 :%d
 athis is a test\e:w! test.out

diff --git a/src/testdir/test92.in b/src/testdir/test92.in
index e61483294894186189e75ede85625957d7562694..9593aec4c73e2ae142dca50262c607dc62fbfea8 100644 (file)
--- a/src/testdir/test92.in
+++ b/src/testdir/test92.in
@@ -33,7 +33,7 @@ j016|3zl:split
 :mksession! test.out
 :new test.out
 :v/\(^ *normal! 0\|^ *exe 'normal!\)/d
-:w
+:w! test.out
 :qa!
 ENDTEST
 

diff --git a/src/testdir/test93.in b/src/testdir/test93.in
index 8444ba513b9cdf61f4aaa83f4e15cce82b6d64bf..877838ce1b3963e67a22141e137babb35d634280 100644 (file)
--- a/src/testdir/test93.in
+++ b/src/testdir/test93.in
@@ -33,7 +33,7 @@ j016|3zl:split
 :mksession! test.out
 :new test.out
 :v/\(^ *normal! 0\|^ *exe 'normal!\)/d
-:w
+:w! test.out
 :qa!
 ENDTEST
 

diff --git a/src/version.c b/src/version.c
index c8ba9f4f5ac005a618a5079947a6ec30fe99985d..fc1880b906827e8dba72c9c5d6337460ca3f57a3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    33,
 /**/
     32,
 /**/