diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-18 22:30:09 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-18 22:30:09 -0400 |
| commit | 9c7038c4757351bbeb1e9e6615ec833d3c7dfb4e (patch) | |
| tree | 39f75a936ed160cf421b61f3e3a24efafd9e268a | |
| parent | c17f6c5396ec3c7cf734f3e7602dd4a5a8e772da (diff) | |
| parent | b907c85fb44b0828866ab06bc3cff8a178aa4a94 (diff) | |
| download | rneovim-9c7038c4757351bbeb1e9e6615ec833d3c7dfb4e.tar.gz rneovim-9c7038c4757351bbeb1e9e6615ec833d3c7dfb4e.tar.bz2 rneovim-9c7038c4757351bbeb1e9e6615ec833d3c7dfb4e.zip | |
Merge pull request #4780 from jamessan/vim-7.4.1046
vim-patch:7.4.1046
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_menu.vim | 9 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 7195c7e632..0e3149b912 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -41,6 +41,7 @@ SCRIPTS := \ NEW_TESTS = \ test_cursor_func.res \ test_help_tagjump.res \ + test_menu.res \ test_viml.res \ test_alot.res diff --git a/src/nvim/testdir/test_menu.vim b/src/nvim/testdir/test_menu.vim new file mode 100644 index 0000000000..be559467c8 --- /dev/null +++ b/src/nvim/testdir/test_menu.vim @@ -0,0 +1,9 @@ +" Test that the system menu can be loaded. + +func Test_load_menu() + try + source $VIMRUNTIME/menu.vim + catch + call assert_false(1, 'error while loading menus: ' . v:exception) + endtry +endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index 48db7d86ee..a8612e10f9 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -638,7 +638,7 @@ static int included_patches[] = { 1049, 1048, 1047, - // 1046, + 1046, // 1045 NA // 1044 NA // 1043 NA |