vim-patch:7.4.1548

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

https://github.com/vim/vim/commit/5a2800fd141a8fc0c80cdf421dcb76001a22327f

3 files changed, 2 insertions, 25 deletions

diff --git a/src/nvim/version.c b/src/nvim/version.c
index e45d61014e..5fdbb7db57 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -151,7 +151,7 @@ static int included_patches[] = {
   1551,
   1550,
   // 1549,
-  // 1548,
+  1548,
   // 1547,
   1546,
   // 1545 NA
diff --git a/test/functional/legacy/055_list_and_dict_types_spec.lua b/test/functional/legacy/055_list_and_dict_types_spec.lua
index dee138e6d8..b9e5a8bc03 100644
--- a/test/functional/legacy/055_list_and_dict_types_spec.lua
+++ b/test/functional/legacy/055_list_and_dict_types_spec.lua
@@ -112,29 +112,6 @@ describe('list and dictionary types', function()
     expect('\n101101')
   end)
 
-  it('changing var type should fail', function()
-    source([[
-      lang C
-      " The list from the first test repeated after splitting the tests.
-      let l = [1, 'as''d', [1, 2, function("strlen")], {'a': 1},]
-      " The dict from the first test repeated after splitting the tests.
-      let d = {'c': 'ccc', '1': 99, '3': 33, '-1': {'a': 1}}
-      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]])
-    expect([[
-      
-      Vim(let):E706: d
-      Vim(let):E706: l]])
-  end)
-
   it('removing items with :unlet', function()
     source([[
       lang C
diff --git a/test/functional/legacy/101_hlsearch_spec.lua b/test/functional/legacy/101_hlsearch_spec.lua
index 0d88e99278..fa29e5fbe8 100644
--- a/test/functional/legacy/101_hlsearch_spec.lua
+++ b/test/functional/legacy/101_hlsearch_spec.lua
@@ -61,6 +61,6 @@ describe('v:hlsearch', function()
       0:not highlighted
       1:highlighted
       0:not highlighted
-      Vim(let):E706:]])
+      Vim(let):E745:]])
   end)
 end)