Merge #10918 from janlazo/vim-8.0.1697

vim-patch:8.0.{1697,1729}

5 files changed, 17 insertions, 17 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 79e67f6d7b..683d44a245 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -3366,15 +3366,15 @@ static int pattern_match(char_u *pat, char_u *text, int ic)
  * types for expressions.
  */
 typedef enum {
-  TYPE_UNKNOWN = 0
-  , TYPE_EQUAL          /* == */
-  , TYPE_NEQUAL         /* != */
-  , TYPE_GREATER        /* >  */
-  , TYPE_GEQUAL         /* >= */
-  , TYPE_SMALLER        /* <  */
-  , TYPE_SEQUAL         /* <= */
-  , TYPE_MATCH          /* =~ */
-  , TYPE_NOMATCH        /* !~ */
+  TYPE_UNKNOWN = 0,
+  TYPE_EQUAL,         // ==
+  TYPE_NEQUAL,        // !=
+  TYPE_GREATER,       // >
+  TYPE_GEQUAL,        // >=
+  TYPE_SMALLER,       // <
+  TYPE_SEQUAL,        // <=
+  TYPE_MATCH,         // =~
+  TYPE_NOMATCH,       // !~
 } exptype_T;
 
 // TODO(ZyX-I): move to eval/expressions
diff --git a/src/nvim/ex_eval.h b/src/nvim/ex_eval.h
index d5f8737bf3..2237b6aca3 100644
--- a/src/nvim/ex_eval.h
+++ b/src/nvim/ex_eval.h
@@ -94,7 +94,7 @@ typedef enum
 {
   ET_USER,       // exception caused by ":throw" command
   ET_ERROR,      // error exception
-  ET_INTERRUPT   // interrupt exception triggered by Ctrl-C
+  ET_INTERRUPT,  // interrupt exception triggered by Ctrl-C
 } except_type_T;
 
 /*
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim
index bcd6d021a0..df512e2e3f 100644
--- a/src/nvim/testdir/shared.vim
+++ b/src/nvim/testdir/shared.vim
@@ -133,7 +133,7 @@ func s:kill_server(cmd)
   endif
 endfunc
 
-" Wait for up to a second for "expr" to become true.  "expr" can be a
+" Wait for up to five seconds for "expr" to become true.  "expr" can be a
 " stringified expression to evaluate, or a funcref without arguments.
 "
 " A second argument can be used to specify a different timeout in msec.
@@ -141,7 +141,7 @@ endfunc
 " Return time slept in milliseconds.  With the +reltime feature this can be
 " more than the actual waiting time.  Without +reltime it can also be less.
 func WaitFor(expr, ...)
-  let timeout = get(a:000, 0, 1000)
+  let timeout = get(a:000, 0, 5000)
   " using reltime() is more accurate, but not always available
   if has('reltime')
     let start = reltime()
diff --git a/src/nvim/testdir/test_clientserver.vim b/src/nvim/testdir/test_clientserver.vim
index f03a6903c1..813cb338a5 100644
--- a/src/nvim/testdir/test_clientserver.vim
+++ b/src/nvim/testdir/test_clientserver.vim
@@ -32,7 +32,7 @@ func Test_client_server()
 
   " Takes a short while for the server to be active.
   " When using valgrind it takes much longer.
-  call WaitFor('serverlist() =~ "' . name . '"', 5000)
+  call WaitFor('serverlist() =~ "' . name . '"')
   call assert_match(name, serverlist())
 
   call remote_foreground(name)
diff --git a/src/nvim/testdir/test_quotestar.vim b/src/nvim/testdir/test_quotestar.vim
index 3a8fdef3a3..b83fbe40e8 100644
--- a/src/nvim/testdir/test_quotestar.vim
+++ b/src/nvim/testdir/test_quotestar.vim
@@ -74,20 +74,20 @@ func Do_test_quotestar_for_x11()
   " by the server.
   let @* = 'no'
   call remote_foreground(name)
-  call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "no"', 3000)
+  call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "no"')
 
   " Set the * register on the server.
   call remote_send(name, ":let @* = 'yes'\<CR>")
-  call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"', 3000)
+  call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"')
 
   " Check that the *-register of this vim instance is changed as expected.
-  call WaitFor('@* == "yes"', 3000)
+  call WaitFor('@* == "yes"')
 
   " Handle the large selection over 262040 byte.
   let length = 262044
   let sample = 'a' . repeat('b', length - 2) . 'c'
   let @* = sample
-  call WaitFor('remote_expr("' . name . '", "len(@*) >= ' . length . '", "", 1)', 3000)
+  call WaitFor('remote_expr("' . name . '", "len(@*) >= ' . length . '", "", 1)')
   let res = remote_expr(name, "@*", "", 2)
   call assert_equal(length, len(res))
   " Check length to prevent a large amount of output at assertion failure.