Mercurial > vim

changeset 21379:20dad734a2cb v8.2.1240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1240: GUI tests sometimes fail because of translations Commit: https://github.com/vim/vim/commit/10e1d01aaf5504675fd9197c75d1da0de0e5b429 Author: Bram Moolenaar <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 18 Jul 2020 22:15:05 +0200
parents 4c41ccdedd6b
children 17c6dd970b13
files src/testdir/runtest.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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,