Merge #10369 from janlazo/vim-8.0.1202

vim-patch:8.0.{1202,1259}
This commit is contained in:
Justin M. Keyes
2019-06-29 13:51:50 +02:00
committed by GitHub
3 changed files with 12 additions and 3 deletions

View File

@@ -1939,7 +1939,7 @@ void do_wqall(exarg_T *eap)
}
FOR_ALL_BUFFERS(buf) {
if (!bufIsChanged(buf)) {
if (!bufIsChanged(buf) || bt_dontwrite(buf)) {
continue;
}
/*

View File

@@ -133,7 +133,9 @@ func s:kill_server(cmd)
endif
endfunc
" Wait for up to a second for "expr" to become true.
" Wait for up to a second 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.
"
" Return time slept in milliseconds. With the +reltime feature this can be
@@ -146,8 +148,13 @@ func WaitFor(expr, ...)
else
let slept = 0
endif
if type(a:expr) == v:t_func
let Test = a:expr
else
let Test = {-> eval(a:expr) }
endif
for i in range(timeout / 10)
if eval(a:expr)
if Test()
if has('reltime')
return float2nr(reltimefloat(reltime(start)) * 1000)
endif

View File

@@ -1,5 +1,7 @@
" Test for the search command
source shared.vim
func Test_search_cmdline()
" See test/functional/legacy/search_spec.lua
throw 'skipped: Nvim does not support test_override()'