diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-14 17:13:59 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-14 17:13:59 +0100 |
| commit | 217ea51ee4c4cb6cf690eb0da70cc4c81291aa2e (patch) | |
| tree | ce15f77612408e7dd7901dfc8be270e85fefb9b0 | |
| parent | 6ce1b59228b94f4a5b076af75b091e14483c1392 (diff) | |
| download | vim-git-217ea51ee4c4cb6cf690eb0da70cc4c81291aa2e.tar.gz | |
patch 8.2.5094: MS-Windows GUI: empty command may cause a dialogv8.2.5094
Problem: MS-Windows GUI: empty command may cause a dialog.
Solution: Delete the dialog file. Improve the message.
| -rw-r--r-- | src/testdir/runtest.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_ex_mode.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index a4c238e8a..db6797d1b 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('<NL>')) call delete('guidialogfile') endif diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim index d981ced6b..fafdda8de 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 50c6ed3b0..fb9f794f1 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 */ /**/ + 5094, +/**/ 5093, /**/ 5092, |