diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-12-14 17:33:20 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2017-02-14 17:38:16 -0700 |
| commit | a0ce66371096db21f341f061df8c1b7b4d9e38fe (patch) | |
| tree | f21f273cded7f28c2eca3009f397eecc091accdc | |
| parent | fc46efd3f2d95920bf50832848515b14b12c0723 (diff) | |
| download | rneovim-a0ce66371096db21f341f061df8c1b7b4d9e38fe.tar.gz rneovim-a0ce66371096db21f341f061df8c1b7b4d9e38fe.tar.bz2 rneovim-a0ce66371096db21f341f061df8c1b7b4d9e38fe.zip | |
vim-patch:7.4.2076
Problem: Syntax error when dict has '>' key.
Solution: Check for endchar. (Ken Takata)
https://github.com/vim/vim/commit/4f0383bc3fe5af0229fb66b53fe94329af783eff
| -rw-r--r-- | src/nvim/testdir/test_lambda.vim | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test.vim | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_lambda.vim b/src/nvim/testdir/test_lambda.vim index 43483841ac..d51b6f7c5a 100644 --- a/src/nvim/testdir/test_lambda.vim +++ b/src/nvim/testdir/test_lambda.vim @@ -284,5 +284,3 @@ func Test_named_function_closure() call garbagecollect() call assert_equal(14, s:Abar()) endfunc -======= ->>>>>>> 381a8796... vim-patch:7.4.2044 diff --git a/src/nvim/version.c b/src/nvim/version.c index 70a70a6e83..815c401279 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -364,7 +364,7 @@ static int included_patches[] = { // 2079 NA // 2078 NA 2077, - // 2076, + 2076, 2075, 2074, // 2073 NA diff --git a/test.vim b/test.vim new file mode 100644 index 0000000000..f586b0042b --- /dev/null +++ b/test.vim @@ -0,0 +1,7 @@ + func! Afoo() + let x = 14 + func! s:Abar() + return x + endfunc + endfunc + call Afoo() |