Merge remote-tracking branch 'vim/master'

Author: splhack

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

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

src/version.c

@@ -756,6 +756,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1046,
 /**/
     1045,
 /**/