patch 7.4.1046

Problem:    No test coverage for menus.
Solution:   Load the standard menus and check there is no error.

diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 20add03ce241d358784391392c707a8779600712..9800afce7b1ddb432d9610d34d37d86917b93afc 100644 (file)
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -3,6 +3,7 @@
 
 source test_backspace_opt.vim
 source test_lispwords.vim
+source test_menu.vim
 source test_searchpos.vim
 source test_set.vim
 source test_sort.vim

diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
new file mode 100644 (file)
index 0000000..be55946
--- /dev/null
+++ b/src/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/version.c b/src/version.c
index 86f50c33efed1a846b2689d1edb5eddd12b76a29..499387fdf4544a7fdd3bcf803b40ace3bd51822a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1046,
 /**/
     1045,
 /**/