summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-04 21:41:05 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-04 21:41:05 +0100
commita1c8ecfda90c0e0e519762ae0521d7f6e297c32e (patch)
tree6ef10100914bd0b5a4932076d2e58971d7b68615
parent5558d19432120696409c007c64d5ba52eed42670 (diff)
patch 8.0.0413: menu test fails on MS-Windows using gvimv8.0.0413
Problem: Menu test fails on MS-Windows using gvim. Solution: First delete the English menus.
-rw-r--r--src/testdir/test_menu.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
index f7745660b9..8acc844f0c 100644
--- a/src/testdir/test_menu.vim
+++ b/src/testdir/test_menu.vim
@@ -10,6 +10,7 @@ func Test_load_menu()
catch
call assert_false(1, 'error while loading menus: ' . v:exception)
endtry
+ call assert_match('browse confirm w', execute(':menu File.Save'))
source $VIMRUNTIME/delmenu.vim
endfunc
@@ -21,6 +22,8 @@ func Test_translate_menu()
throw 'Skipped: translated menu not found'
endif
+ " First delete any English menus.
+ source $VIMRUNTIME/delmenu.vim
set langmenu=de_de
source $VIMRUNTIME/menu.vim
call assert_match('browse confirm w', execute(':menu Datei.Speichern'))
diff --git a/src/version.c b/src/version.c
index 309b8776eb..040862b60f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 413,
+/**/
412,
/**/
411,