Mercurial > vim

changeset 29148:8e87a5d2284c v8.2.5094

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.5094: MS-Windows GUI: empty command may cause a dialog Commit: https://github.com/vim/vim/commit/217ea51ee4c4cb6cf690eb0da70cc4c81291aa2e Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jun 14 17:13:59 2022 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 14 Jun 2022 18:15:03 +0200
parents df7cd667ac19
children b467ffd8824f
files src/testdir/runtest.vim src/testdir/test_ex_mode.vim src/version.c
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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
 
 
--- 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,