aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-07-29 10:24:07 +0800
committerJustin M. Keyes <justinkz@gmail.com>2017-07-30 14:15:26 +0200
commit5cd68b39003dc51c5b80147d689cf7e8b67443b0 (patch)
tree82daa7a5bd124687c3defd039e6bd46e8dcd211d
parent743993eb553302a461ee0ef9cffa57f93c10c955 (diff)
downloadrneovim-5cd68b39003dc51c5b80147d689cf7e8b67443b0.tar.gz
rneovim-5cd68b39003dc51c5b80147d689cf7e8b67443b0.tar.bz2
rneovim-5cd68b39003dc51c5b80147d689cf7e8b67443b0.zip
vim-patch:8.0.0124 #7092
Problem: Internal error for assert_inrange(1, 1). Solution: Adjust number of allowed arguments. (Dominique Pelle) https://github.com/vim/vim/commit/3421566376b5723213af502bd3c2b9debe025ef1
-rw-r--r--src/nvim/eval.lua2
-rw-r--r--src/nvim/version.c2
-rw-r--r--test/functional/legacy/assert_spec.lua5
3 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 08baae4086..0e359fb61c 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -29,7 +29,7 @@ return {
assert_exception={args={1, 2}},
assert_fails={args={1, 2}},
assert_false={args={1, 2}},
- assert_inrange={args={2, 3}},
+ assert_inrange={args={3, 4}},
assert_match={args={2, 3}},
assert_notequal={args={2, 3}},
assert_notmatch={args={2, 3}},
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4f83b09e1b..962096000a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -605,7 +605,7 @@ static const int included_patches[] = {
127,
// 126,
// 125,
- // 124,
+ 124,
// 123 NA
// 122 NA
121,
diff --git a/test/functional/legacy/assert_spec.lua b/test/functional/legacy/assert_spec.lua
index 2f342ec9a3..d646e8dbf4 100644
--- a/test/functional/legacy/assert_spec.lua
+++ b/test/functional/legacy/assert_spec.lua
@@ -253,6 +253,11 @@ describe('assert function:', function()
"Expected range 5 - 7, but got 8",
})
end)
+
+ it('assert_inrange(1, 1) returns E119', function()
+ eq('Vim(call):E119: Not enough arguments for function: assert_inrange',
+ exc_exec("call assert_inrange(1, 1)"))
+ end)
end)
-- assert_report({msg})