aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-05-27 04:22:52 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-05-27 04:22:52 -0400
commit1d63672c77a7a6307a8c99bd8cea59af3f94286a (patch)
tree43ea9138b30267e94f76d956c16509813e718666 /runtime
parentbfbc974d13c46ace84bec261263ab044b8c81265 (diff)
parentccef5c9c77543fb0cf1b31c82fcb566cca7eff4c (diff)
downloadrneovim-1d63672c77a7a6307a8c99bd8cea59af3f94286a.tar.gz
rneovim-1d63672c77a7a6307a8c99bd8cea59af3f94286a.tar.bz2
rneovim-1d63672c77a7a6307a8c99bd8cea59af3f94286a.zip
Merge pull request #4821 from jamessan/vim-7.4.1096
vim-patch:7.4.1096,7.4.1567
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/eval.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 8b23d2ff5f..bda7a4b910 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1789,6 +1789,7 @@ argv({nr}) String {nr} entry of the argument list
argv() List the argument list
assert_equal({exp}, {act} [, {msg}]) none assert {exp} equals {act}
assert_exception({error} [, {msg}]) none assert {error} is in v:exception
+assert_fails( {cmd} [, {error}]) none assert {cmd} fails
assert_false({actual} [, {msg}]) none assert {actual} is false
assert_true({actual} [, {msg}]) none assert {actual} is true
asin({expr}) Float arc sine of {expr}
@@ -2263,6 +2264,11 @@ assert_exception({error} [, {msg}]) *assert_exception()*
call assert_exception('E492:')
endtry
+assert_fails({cmd} [, {error}]) *assert_fails()*
+ Run {cmd} and add an error message to |v:errors| if it does
+ NOT produce an error.
+ When {error} is given it must match |v:errmsg|.
+
assert_false({actual} [, {msg}]) *assert_false()*
When {actual} is not false an error message is added to
|v:errors|, like with |assert_equal()|.