From 34a7814219b835e8d552cac890ccdf67aad65b2a Mon Sep 17 00:00:00 2001 From: Michael Ennen Date: Wed, 26 Oct 2016 22:50:07 -0700 Subject: [PATCH] vim-patch:7.4.1605 Problem: Catching exception that won't be thrown. Solution: Remove try/catch. https://github.com/vim/vim/commit/3905e291fe4375ca5c59efa9ffcb01a39c7be3a9 --- src/nvim/version.c | 2 +- .../functional/legacy/055_list_and_dict_types_spec.lua | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index fe03b6915b..2e711797f4 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -837,7 +837,7 @@ static int included_patches[] = { // 1608, // 1607, // 1606, - // 1605, + 1605, 1604, 1603, // 1602 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 b9e5a8bc03..dbe9e1bc7f 100644 --- a/test/functional/legacy/055_list_and_dict_types_spec.lua +++ b/test/functional/legacy/055_list_and_dict_types_spec.lua @@ -274,17 +274,13 @@ describe('list and dictionary types', function() let dict.data = [1,2,3] call dict.func("len: ") let x = dict.func("again: ") - try - let Fn = dict.func - call Fn('xxx') - catch - $put =v:exception[:15] - endtry]]) + let Fn = dict.func + call Fn('xxx')]]) expect([[ len: 3 again: 3 - Vim(call):E725: ]]) + xxx3]]) end) it('Function in script-local List or Dict', function()