From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 8 Mar 2016 18:07:22 +0000 (+0100)
Subject: patch 7.4.1520
X-Git-Tag: v7.4.1520
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9d473ea124339c4dd173127db47c4583645ac2c;p=vim

patch 7.4.1520
Problem:    Channel test: Waiting for a file to appear doesn't work.
Solution:   In waitFor() ignore errors.
---

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 15d849c03..061b30c25 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -103,9 +103,12 @@ endfunc
 " Wait for up to a second for "expr" to become true.
 func s:waitFor(expr)
   for i in range(100)
-    if eval(a:expr)
-      return
-    endif
+    try
+      if eval(a:expr)
+	return
+      endif
+    catch
+    endtry
     sleep 10m
   endfor
 endfunc
diff --git a/src/version.c b/src/version.c
index be05a459c..15baf5df9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1520,
 /**/
     1519,
 /**/