summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_listdict.vim6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim
index 54486ff49..9085c6e00 100644
--- a/src/testdir/test_listdict.vim
+++ b/src/testdir/test_listdict.vim
@@ -1007,8 +1007,10 @@ func Test_null_list()
call assert_equal('[]', string(l))
call assert_equal(0, sort(l))
call assert_equal(0, uniq(l))
- call assert_fails("let k = [] + l", 'E15:')
- call assert_fails("let k = l + []", 'E15:')
+ let k = [] + l
+ call assert_equal([], k)
+ let k = l + []
+ call assert_equal([], k)
call assert_equal(0, len(copy(l)))
call assert_equal(0, count(l, 5))
call assert_equal([], deepcopy(l))
diff --git a/src/version.c b/src/version.c
index 8dabd6059..e0bcc9012 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1822,
+/**/
1821,
/**/
1820,