diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-18 22:03:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-18 22:03:11 +0200 |
| commit | 10e1d01aaf5504675fd9197c75d1da0de0e5b429 (patch) | |
| tree | 72bd736421ae6d2080706d20ceb91b71fc365dc3 | |
| parent | de2396fc875837c47b1c13f5e80e0a1200c5eb61 (diff) | |
patch 8.2.1240: GUI tests sometimes fail because of translationsv8.2.1240
Problem: GUI tests sometimes fail because of translations.
Solution: Reload the menus without translation. (Taro Muraoka, closes #6486)
| -rw-r--r-- | src/testdir/runtest.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 3f412c342b..60805f1318 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 d659c73887..1b16ffb3e8 100644 --- 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, |