patch 7.4.1548

Problem:    Two tests fail.
Solution:   Adjust the expected error number. Remove check for type.

diff --git a/src/testdir/test101.ok b/src/testdir/test101.ok
index f063b85dea5ff3fd2ceec1c520b81162d2387399..86aa73b205e19b2981ddb09857966fc6ff48d17b 100644 (file)
--- 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 9e3c1168cc141046ab7ba97e8a389aa8fd7b1c51..635b35fc605f5223151b6c6c27db9130707a519e 100644 (file)
--- 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 607a95ead9bc9b59a714139a800a3e4274f6fbcb..ee6d3a08007d3d1d81980bca9e3b707851faa789 100644 (file)
--- 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 c2ba5535f4c5c36c297aa62c32e278cb2771c011..943bec698bb3952aad70dbd2ff9b68fe56f89025 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1548,
 /**/
     1547,
 /**/