diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-25 02:54:08 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-25 02:54:08 -0400 |
| commit | 52348a1f8c9f4f91c96a7e2d5159127a8f7820ef (patch) | |
| tree | 91d5882a22c317e443cd0706769c7a3f5d5e26b9 /src | |
| parent | d46772588bf1fea5fe7f4508023637cf37f45564 (diff) | |
| parent | 4a40231317c118cd4b63fb7c5f1922d6dbf78419 (diff) | |
| download | rneovim-52348a1f8c9f4f91c96a7e2d5159127a8f7820ef.tar.gz rneovim-52348a1f8c9f4f91c96a7e2d5159127a8f7820ef.tar.bz2 rneovim-52348a1f8c9f4f91c96a7e2d5159127a8f7820ef.zip | |
Merge pull request #4807 from jamessan/vim-7.4.1053
vim-patch:7.4.{1053,1071}
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index 5b34b4fc31..2712fb9371 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -65,7 +65,8 @@ function /^Test_ redir END let tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g')) -for test in tests +" Execute the tests in alphabetical order. +for test in sort(tests) if exists("*SetUp") call SetUp() endif diff --git a/src/nvim/version.c b/src/nvim/version.c index d68300e47a..4619acd9e7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -613,7 +613,7 @@ static int included_patches[] = { // 1074 NA, // 1073, 1072, - // 1071, + 1071, // 1070 NA // 1069 NA // 1068, @@ -631,7 +631,7 @@ static int included_patches[] = { // 1056, 1055, 1054, - // 1053, + 1053, 1052, // 1051, 1050, |