summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-12-04 13:37:41 +0100
committerBram Moolenaar <Bram@vim.org>2016-12-04 13:37:41 +0100
commit3421566376b5723213af502bd3c2b9debe025ef1 (patch)
treebe96cf6e3909b41b9422e9c46f8d73cb6feee845
parenta899e6ecc4523c7e411eaf6fbaa4197d70f6f39e (diff)
downloadvim-git-3421566376b5723213af502bd3c2b9debe025ef1.tar.gz
patch 8.0.0124v8.0.0124
Problem: Internal error for assert_inrange(1, 1). Solution: Adjust number of allowed arguments. (Dominique Pelle)
-rw-r--r--src/evalfunc.c2
-rw-r--r--src/testdir/test_assert.vim2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 6721173c3..08be12bb1 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -471,7 +471,7 @@ static struct fst
{"assert_exception", 1, 2, f_assert_exception},
{"assert_fails", 1, 2, f_assert_fails},
{"assert_false", 1, 2, f_assert_false},
- {"assert_inrange", 2, 3, f_assert_inrange},
+ {"assert_inrange", 3, 4, f_assert_inrange},
{"assert_match", 2, 3, f_assert_match},
{"assert_notequal", 2, 3, f_assert_notequal},
{"assert_notmatch", 2, 3, f_assert_notmatch},
diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim
index 0ab664ad3..25630f2db 100644
--- a/src/testdir/test_assert.vim
+++ b/src/testdir/test_assert.vim
@@ -117,6 +117,8 @@ func Test_assert_inrange()
call assert_inrange(5, 7, 8)
call assert_match("Expected range 5 - 7, but got 8", v:errors[0])
call remove(v:errors, 0)
+
+ call assert_fails('call assert_inrange(1, 1)', 'E119:')
endfunc
func Test_user_is_happy()
diff --git a/src/version.c b/src/version.c
index 536d2182f..490e150ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 124,
+/**/
123,
/**/
122,