# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1457808304 -3600
# Node ID 14ab6c6855819fc316225a36dd400556ec19bb02
# Parent  8a5f122f70f935bad1be2850bba5eda0f246d62c
commit https://github.com/vim/vim/commit/5a2800fd141a8fc0c80cdf421dcb76001a22327f
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 12 19:33:49 2016 +0100

    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
--- a/src/testdir/test101.ok
+++ b/src/testdir/test101.ok
@@ -9,4 +9,4 @@ 1:highlighted
 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
--- 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
--- 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
--- 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,