# HG changeset patch # User Christian Brabandt # Date 1443196805 -7200 # Node ID d1e35ca56c73e00417b0b994e299d4f18d379e6a # Parent 2a1fe1d5f2faa49658ab3a2ba652f25c8315c942 commit https://github.com/vim/vim/commit/0a777ab9890ba0e8dd57f082e98fde1adab36aa0 Author: Bram Moolenaar Date: Fri Sep 25 17:56:50 2015 +0200 patch 7.4.881 Problem: Test 49 fails. Solution: Add line number to check of call stack. diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -1,6 +1,6 @@ " Vim script language tests " Author: Servatius Brandt -" Last Change: 2013 Jun 06 +" Last Change: 2015 Sep 25 "------------------------------------------------------------------------------- " Test environment {{{1 @@ -5188,19 +5188,19 @@ catch /.*/ Xpath 65536 " X: 65536 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(1, "oops", '\', '\<2\>') + call CHECK(1, "oops", '\', '\<2\>') exec "let exception = v:exception" exec "let throwpoint = v:throwpoint" - call CHECK(2, "oops", '\', '\<2\>') + call CHECK(2, "oops", '\', '\<2\>') CmdException CmdThrowpoint - call CHECK(3, "oops", '\', '\<2\>') + call CHECK(3, "oops", '\', '\<2\>') call FuncException() call FuncThrowpoint() - call CHECK(4, "oops", '\', '\<2\>') + call CHECK(4, "oops", '\', '\<2\>') exec "source" scriptException exec "source" scriptThrowPoint - call CHECK(5, "oops", '\', '\<2\>') + call CHECK(5, "oops", '\', '\<2\>') try Xpath 131072 " X: 131072 call G("arrgh", 4) @@ -5208,7 +5208,7 @@ catch /.*/ Xpath 262144 " X: 262144 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(6, "arrgh", '\', '\<4\>') + call CHECK(6, "arrgh", '\', '\<4\>') try Xpath 524288 " X: 524288 let g:arg = "autsch" @@ -5226,7 +5226,7 @@ catch /.*/ Xpath 2097152 " X: 2097152 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(8, "arrgh", '\', '\<4\>') + call CHECK(8, "arrgh", '\', '\<4\>') try Xpath 4194304 " X: 4194304 let g:arg = "brrrr" @@ -5242,27 +5242,27 @@ catch /.*/ Xpath 16777216 " X: 16777216 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(10, "arrgh", '\', '\<4\>') + call CHECK(10, "arrgh", '\', '\<4\>') endtry Xpath 33554432 " X: 33554432 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(11, "arrgh", '\', '\<4\>') + call CHECK(11, "arrgh", '\', '\<4\>') endtry Xpath 67108864 " X: 67108864 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(12, "arrgh", '\', '\<4\>') + call CHECK(12, "arrgh", '\', '\<4\>') finally Xpath 134217728 " X: 134217728 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(13, "oops", '\', '\<2\>') + call CHECK(13, "oops", '\', '\<2\>') endtry Xpath 268435456 " X: 268435456 let exception = v:exception let throwpoint = v:throwpoint - call CHECK(14, "oops", '\', '\<2\>') + call CHECK(14, "oops", '\', '\<2\>') finally Xpath 536870912 " X: 536870912 let exception = v:exception diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 881, +/**/ 880, /**/ 879,