summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-16 16:36:43 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-16 16:36:43 +0100
commita272624c763fea9f98510bbc5b1f2b65a309c765 (patch)
tree29c9417c974f79247988d36f48830c5e547b1680
parentde8be2beaeb99961247766a9b8181429be1617d6 (diff)
downloadvim-git-a272624c763fea9f98510bbc5b1f2b65a309c765.tar.gz
patch 8.2.5112: gui test hangs on MS-Windowsv8.2.5112
Problem: Gui test hangs on MS-Windows. Solution: Use "!start" to start Vim.
-rw-r--r--src/testdir/test_gui.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 954cf2a06..373a0a25c 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1594,7 +1594,11 @@ func Test_gui_dialog_file()
confirm qa
END
call writefile(lines, 'Xlines')
- execute '!' .. GetVimCommand() .. ' -g -f --clean --gui-dialog-file Xdialog -S Xlines'
+ let prefix = '!'
+ if has('win32')
+ let prefix = '!start '
+ endif
+ execute prefix .. GetVimCommand() .. ' -g -f --clean --gui-dialog-file Xdialog -S Xlines'
call WaitForAssert({-> assert_true(filereadable('Xdialog'))})
call assert_match('Question: Save changes to "Xfile"?', readfile('Xdialog')->join('<NL>'))
diff --git a/src/version.c b/src/version.c
index a438340d6..66b03c3ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5112,
+/**/
5111,
/**/
5110,