Permalink
Browse files

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.
  • Loading branch information...
brammool committed Nov 2, 2017
1 parent 5130f31 commit c20e0d52071a3f6e12321ec3344024faa4695da9
Showing with 11 additions and 8 deletions.
  1. +5 −8 src/testdir/shared.vim
  2. +4 −0 src/testdir/test_netbeans.vim
  3. +2 −0 src/version.c
View
@@ -125,15 +125,12 @@ func WaitFor(expr, ...)
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
@@ -19,6 +19,7 @@ endfunc
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 @@ func Test_nb_basic()
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')
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1249,
/**/
1248,
/**/

0 comments on commit c20e0d5

Please sign in to comment.