diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 3f412c342b88f6615d82878fe7b3808ae12c5d2b..60805f1318fb7e09bf1bdcf1a686545f225494c0 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -105,6 +105,13 @@ set nomore " Output all messages in English. lang mess C +" suppress menu translation +if has('gui_running') && exists('did_install_default_menus') + source $VIMRUNTIME/delmenu.vim + set langmenu=none + source $VIMRUNTIME/menu.vim +endif + " Always use forward slashes. set shellslash diff --git a/src/version.c b/src/version.c index d659c7388703e3d1208c20508a5659492d69f9d5..1b16ffb3e8a35c54bc9f09a5c5a6b685314e180a 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1240, /**/ 1239, /**/