aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_lambda.vim
diff options
context:
space:
mode:
authorMichael Ennen <mike.ennen@gmail.com>2016-12-17 22:33:03 -0700
committerMichael Ennen <mike.ennen@gmail.com>2017-02-14 17:38:18 -0700
commit1f715ac1c1a1eee43360be911636020ed855e12c (patch)
treeb7e7fdb6df01a0e32bba4f9defa2e701168b2661 /src/nvim/testdir/test_lambda.vim
parent1e3c0efa0f3d41563f91097d04b3616848d5eb62 (diff)
downloadrneovim-1f715ac1c1a1eee43360be911636020ed855e12c.tar.gz
rneovim-1f715ac1c1a1eee43360be911636020ed855e12c.tar.bz2
rneovim-1f715ac1c1a1eee43360be911636020ed855e12c.zip
vim-patch:7.4.2136
Problem: Closure function fails. Solution: Don't reset uf_scoped when it points to another funccal. https://github.com/vim/vim/commit/580164481924ed8611eb79f0247a0eb1ca0b3b9a
Diffstat (limited to 'src/nvim/testdir/test_lambda.vim')
-rw-r--r--src/nvim/testdir/test_lambda.vim4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/nvim/testdir/test_lambda.vim b/src/nvim/testdir/test_lambda.vim
index 98d8ffab40..d51b6f7c5a 100644
--- a/src/nvim/testdir/test_lambda.vim
+++ b/src/nvim/testdir/test_lambda.vim
@@ -284,7 +284,3 @@ func Test_named_function_closure()
call garbagecollect()
call assert_equal(14, s:Abar())
endfunc
-=======
->>>>>>> 42b34811... vim-patch:7.4.2119
-=======
->>>>>>> 789a3319... vim-patch:7.4.2120