From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 18 Jul 2020 20:03:11 +0000 (+0200)
Subject: patch 8.2.1240: GUI tests sometimes fail because of translations
X-Git-Tag: v8.2.1240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10e1d01aaf5504675fd9197c75d1da0de0e5b429;p=vim

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 #6486)
---

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 3f412c342..60805f131 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 d659c7388..1b16ffb3e 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,
 /**/