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 15d849c03a8527389597bf63282391af13a5a3d8..061b30c2510df698b0f7e7c13bc841c5fe725d48 100644 (file)
--- 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 be05a459cf49f70ea6de329fb48c769eb7ed5077..15baf5df9d6863b82c0f2504d4ebe96fd0bf512f 100644 (file)
--- 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,
 /**/