diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-12 19:33:49 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-12 19:33:49 +0100 |
commit | 5a2800fd141a8fc0c80cdf421dcb76001a22327f (patch) | |
tree | aa68790fc6c9ad3fc90cb6d7691ed4a79045c804 | |
parent | 385111bd86e0b38667879c3e89506ca1ae98e1df (diff) | |
download | vim-5a2800fd141a8fc0c80cdf421dcb76001a22327f.zip |
patch 7.4.1548
Problem: Two tests fail.
Solution: Adjust the expected error number. Remove check for type.
-rw-r--r-- | src/testdir/test101.ok | 2 | ||||
-rw-r--r-- | src/testdir/test55.in | 11 | ||||
-rw-r--r-- | src/testdir/test55.ok | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 3 insertions, 14 deletions
diff --git a/src/testdir/test101.ok b/src/testdir/test101.ok index f063b85de..86aa73b20 100644 --- a/src/testdir/test101.ok +++ b/src/testdir/test101.ok @@ -9,4 +9,4 @@ start: 0:not highlighted 1:highlighted 0:not highlighted -Vim(let):E706: +Vim(let):E745: diff --git a/src/testdir/test55.in b/src/testdir/test55.in index 9e3c1168c..635b35fc6 100644 --- a/src/testdir/test55.in +++ b/src/testdir/test55.in @@ -59,17 +59,6 @@ STARTTEST : $put =v:exception :endtry :" -:" Changing var type should fail -:try -: let d = [] -:catch -: $put =v:exception[:14] . v:exception[-1:-1] -:endtry -:try -: let l = {} -:catch -: $put =v:exception[:14] . v:exception[-1:-1] -:endtry :" :" removing items with :unlet :unlet l[2] diff --git a/src/testdir/test55.ok b/src/testdir/test55.ok index 607a95ead..ee6d3a080 100644 --- a/src/testdir/test55.ok +++ b/src/testdir/test55.ok @@ -19,8 +19,6 @@ Vim(call):E737: 3 {'c': 'ccc', '1': 99, 'b': [1, 2, function('strlen')], '3': 33, '-1': {'a': 1}} {'c': 'ccc', '1': 99, '3': 33, '-1': {'a': 1}} 101101 -Vim(let):E706: d -Vim(let):E706: l [1, 'as''d', {'a': 1}] [4] {'1': 99, '3': 33} diff --git a/src/version.c b/src/version.c index c2ba5535f..943bec698 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1548, +/**/ 1547, /**/ 1546, |