aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/testdir/Makefile1
-rw-r--r--src/nvim/testdir/test_menu.vim9
-rw-r--r--src/nvim/version.c2
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