From 217ea51ee4c4cb6cf690eb0da70cc4c81291aa2e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 14 Jun 2022 17:13:59 +0100 Subject: [PATCH] patch 8.2.5094: MS-Windows GUI: empty command may cause a dialog Problem: MS-Windows GUI: empty command may cause a dialog. Solution: Delete the dialog file. Improve the message. --- src/testdir/runtest.vim | 3 +-- src/testdir/test_ex_mode.vim | 3 +++ src/version.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index a4c238e8a2..db6797d1b0 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -246,8 +246,7 @@ func RunTheTest(test) endif if filereadable('guidialogfile') - call add(v:errors, "Unexpected dialog:") - call add(v:errors, readfile('guidialogfile').join('\n')) + call add(v:errors, "Unexpected dialog: " .. readfile('guidialogfile')->join('')) call delete('guidialogfile') endif diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim index d981ced6b8..fafdda8de3 100644 --- a/src/testdir/test_ex_mode.vim +++ b/src/testdir/test_ex_mode.vim @@ -261,6 +261,9 @@ func Test_empty_command_visual_mode() call assert_equal(1, RunVim([], [], '-u NONE -e -s -S Xexmodescript')) call delete('Xexmodescript') + + " This may cause a dialog to be displayed for an empty command, ignore it. + call delete('guidialogfile') endfunc diff --git a/src/version.c b/src/version.c index 50c6ed3b0b..fb9f794f1e 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5094, /**/ 5093, /**/ -- 2.47.2