summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_functions.vim19
-rw-r--r--src/version.c2
2 files changed, 15 insertions, 6 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 6f109e8358..99403e295a 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1622,6 +1622,19 @@ func Test_inputlist()
call assert_fails('call inputlist(test_null_list())', 'E686:')
endfunc
+func Test_range_inputlist()
+ " flush out any garbage left in the buffer
+ while getchar(0)
+ endwhile
+
+ call feedkeys(":let result = inputlist(range(10))\<CR>1\<CR>", 'x')
+ call assert_equal(1, result)
+ call feedkeys(":let result = inputlist(range(3, 10))\<CR>1\<CR>", 'x')
+ call assert_equal(1, result)
+
+ unlet result
+endfunc
+
func Test_balloon_show()
CheckFeature balloon_eval
@@ -2550,12 +2563,6 @@ func Test_range()
call assert_equal(1, index(range(1, 5), 2))
call assert_fails("echo index([1, 2], 1, [])", 'E745:')
- " inputlist()
- call feedkeys(":let result = inputlist(range(10))\<CR>1\<CR>", 'x')
- call assert_equal(1, result)
- call feedkeys(":let result = inputlist(range(3, 10))\<CR>1\<CR>", 'x')
- call assert_equal(1, result)
-
" insert()
call assert_equal([42, 1, 2, 3, 4, 5], insert(range(1, 5), 42))
call assert_equal([42, 1, 2, 3, 4, 5], insert(range(1, 5), 42, 0))
diff --git a/src/version.c b/src/version.c
index 5efbf60ca4..cb4889dc79 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1129,
+/**/
1128,
/**/
1127,