From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 24 Apr 2013 10:56:19 +0000 (+0200)
Subject: updated for version 7.3.906
X-Git-Tag: v7.3.906
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f99152276def2b8f88a3dd5f87f645e9e875da2;p=thirdparty%2Fvim.git

updated for version 7.3.906
Problem:    The "sleep .2" for running tests does not work on Solaris.
Solution:   Fall back to using "sleep 1". (Laurent Blume)
---

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index bcaed91d23..f76f6459b3 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -69,8 +69,10 @@ test1.out: test1.in
 .in.out:
 	-rm -rf $*.failed test.ok $(RM_ON_RUN)
 	cp $*.ok test.ok
-	# Sleep a moment to avoid that the xterm title is messed up
-	@-sleep .2
+	# Sleep a moment to avoid that the xterm title is messed up.
+	# 200 msec is sufficient, but only modern sleep supports a fraction of
+	# a second, fall back to a second if it fails.
+	@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
 	-$(RUN_VIM) $*.in
 
 	# For flaky tests retry one time.
diff --git a/src/version.c b/src/version.c
index c745b1c4a3..a28cf6c31d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    906,
 /**/
     905,
 /**/