diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-23 21:27:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 21:27:20 -0500 |
| commit | cbf2a86c1d3e13eba0c194efb68327857fc3282e (patch) | |
| tree | c3322334d4aa19ccef5ef9a18ec36e0c6a39e991 | |
| parent | 2c154216a431ca3f5f12e623315f626e2671d2e8 (diff) | |
| parent | 4f8964cc003d47175384c587326988bf5cdaf4ef (diff) | |
| download | rneovim-cbf2a86c1d3e13eba0c194efb68327857fc3282e.tar.gz rneovim-cbf2a86c1d3e13eba0c194efb68327857fc3282e.tar.bz2 rneovim-cbf2a86c1d3e13eba0c194efb68327857fc3282e.zip | |
Merge pull request #5654 from brcolow/vim-7.4.1923
vim-patch:7.4.1923
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 67e7c97905..c6e9c26c57 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -32,6 +32,7 @@ SCRIPTS := \ # Keep test_alot*.res as the last one, sort the others. NEW_TESTS = \ test_cscope.res \ + test_cmdline.res \ test_hardcopy.res \ test_help_tagjump.res \ test_history.res \ diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim index 156604051d..4e8cd54ce3 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -8,7 +8,6 @@ source test_ex_undo.vim source test_expr.vim source test_expr_utf8.vim source test_feedkeys.vim -source test_cmdline.vim source test_menu.vim source test_options.vim source test_popup.vim diff --git a/src/nvim/version.c b/src/nvim/version.c index f0f6e964f7..5bcda0bedf 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -519,7 +519,7 @@ static int included_patches[] = { // 1926 NA // 1925 NA // 1924 NA - // 1923, + 1923, // 1922 NA // 1921 NA // 1920 NA |