# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1457460904 -3600
# Node ID 9fb171e8466d46f1d08f662f2dc694218be8a8a1
# Parent  2d050fba6f731fcbe3fbbfb2d3105473d7d08405
commit https://github.com/vim/vim/commit/d9d473ea124339c4dd173127db47c4583645ac2c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Mar 8 19:07:22 2016 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1520,
+/**/
     1519,
 /**/
     1518,