From 5a6698169d10833abad88c98e5a332ddde5d110d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 11 Feb 2019 21:45:00 +0100
Subject: [PATCH] patch 8.1.0896: tests for restricted mode no run for
 MS-Windows GUI

Problem:    Tests for restricted mode no run for MS-Windows GUI.
Solution:   Make tests also work in MS-Windows GUI.
---
 src/testdir/test_restricted.vim | 35 ++++++++++++---------------------
 src/version.c                   |  2 ++
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/testdir/test_restricted.vim b/src/testdir/test_restricted.vim
index 85da94c41..a29f7c33d 100644
--- a/src/testdir/test_restricted.vim
+++ b/src/testdir/test_restricted.vim
@@ -2,27 +2,13 @@
 
 source shared.vim
 
-if has('win32') && has('gui')
-  " Win32 GUI shows a dialog instead of displaying the error in the last line.
-  finish
-endif
+"if has('win32') && has('gui')
+"  " Win32 GUI shows a dialog instead of displaying the error in the last line.
+"  finish
+"endif
 
 func Test_restricted()
-  let cmd = GetVimCommand('Xrestricted')
-  if cmd == ''
-    return
-  endif
-
-  call writefile([
-	\ "silent !ls",
-	\ "call writefile([v:errmsg], 'Xrestrout')",
-	\ "qa!",
-	\ ], 'Xrestricted')
-  call system(cmd . ' -Z')
-  call assert_match('E145:', join(readfile('Xrestrout')))
-
-  call delete('Xrestricted')
-  call delete('Xrestrout')
+  call Run_restricted_test('!ls', 'E145:')
 endfunc
 
 func Run_restricted_test(ex_cmd, error)
@@ -31,10 +17,15 @@ func Run_restricted_test(ex_cmd, error)
     return
   endif
 
+  " Use a VimEnter autocommand to avoid that the error message is displayed in
+  " a dialog with an OK button.
   call writefile([
-	\ a:ex_cmd,
-	\ "call writefile([v:errmsg], 'Xrestrout')",
-	\ "qa!",
+	\ "func Init()",
+	\ "  silent! " . a:ex_cmd,
+	\ "  call writefile([v:errmsg], 'Xrestrout')",
+	\ "  qa!",
+	\ "endfunc",
+	\ "au VimEnter * call Init()",
 	\ ], 'Xrestricted')
   call system(cmd . ' -Z')
   call assert_match(a:error, join(readfile('Xrestrout')))
diff --git a/src/version.c b/src/version.c
index 33353ba84..6e3c6f408 100644
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    896,
 /**/
     895,
 /**/
-- 
2.40.0