# HG changeset patch # User Bram Moolenaar # Date 1595103305 -7200 # Node ID 20dad734a2cbd6e988b87b22a4966a9a9b5f0276 # Parent 4c41ccdedd6b42eabc2bce497995b1220fb410f4 patch 8.2.1240: GUI tests sometimes fail because of translations Commit: https://github.com/vim/vim/commit/10e1d01aaf5504675fd9197c75d1da0de0e5b429 Author: Bram Moolenaar Date: Sat Jul 18 22:03:11 2020 +0200 patch 8.2.1240: GUI tests sometimes fail because of translations Problem: GUI tests sometimes fail because of translations. Solution: Reload the menus without translation. (Taro Muraoka, closes https://github.com/vim/vim/issues/6486) diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim --- 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 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1240, +/**/ 1239, /**/ 1238,