# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1549918807 -3600
# Node ID cf702b29ea0d64bee6b188cee29c14d168646cfc
# Parent  8ee4000692f374d539bfb336e59e0b42c25fe79d
patch 8.1.0896: tests for restricted mode no run for MS-Windows GUI

commit https://github.com/vim/vim/commit/5a6698169d10833abad88c98e5a332ddde5d110d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Feb 11 21:45:00 2019 +0100

    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.

diff --git a/src/testdir/test_restricted.vim b/src/testdir/test_restricted.vim
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    896,
+/**/
     895,
 /**/
     894,