patch 8.0.1249: no error when WaitFor() gets an invalid wrong expression
Problem: No error when WaitFor() gets an invalid wrong expression.
Solution: Do not ignore errors in evaluationg the expression. Fix places
where the expression was wrong.
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index eb43cf4..d6033d5 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -125,15 +125,12 @@
let slept = 0
endif
for i in range(timeout / 10)
- try
- if eval(a:expr)
- if has('reltime')
- return float2nr(reltimefloat(reltime(start)) * 1000)
- endif
- return slept
+ if eval(a:expr)
+ if has('reltime')
+ return float2nr(reltimefloat(reltime(start)) * 1000)
endif
- catch
- endtry
+ return slept
+ endif
if !has('reltime')
let slept += 10
endif
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 4ac03db..aa4e676 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -19,6 +19,7 @@
func Nb_basic(port)
call delete("Xnetbeans")
+ call writefile([], "Xnetbeans")
exe 'nbstart :localhost:' . a:port . ':bunny'
call assert_true(has("netbeans_enabled"))
@@ -53,6 +54,9 @@
endfunc
func Nb_file_auth(port)
+ call delete("Xnetbeans")
+ call writefile([], "Xnetbeans")
+
call assert_fails('nbstart =notexist', 'E660:')
call writefile(['host=localhost', 'port=' . a:port, 'auth=bunny'], 'Xnbauth')
if has('unix')
diff --git a/src/version.c b/src/version.c
index 3504ff6..56e2910 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1249,
+/**/
1248,
/**/
1247,