Merge remote-tracking branch 'vim/master'

Author: splhack

src/Makefile

@@ -2056,7 +2056,7 @@ test1 \
 	test_wordcount \
 	test_writefile \
 	test2 test3 test4 test5 test6 test7 test8 test9 \
-	test11 test12 test13 test14 test15 test16 test17 test18 test19 \
+	test11 test12 test13 test14 test15 test17 test18 test19 \
 	test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
 	test30 test31 test32 test33 test34 test36 test37 test38 test39 \
 	test40 test41 test42 test43 test44 test45 test46 test48 test49 \
@@ -2097,6 +2097,7 @@ test_arglist \
 	test_glob2regpat \
 	test_gn \
 	test_goto \
+	test_gui \
 	test_hardcopy \
 	test_help_tagjump \
 	test_history \

src/os_win32.c

@@ -577,7 +577,7 @@ null_libintl_ngettext(
 	const char *msgid_plural,
 	unsigned long n)
 {
-    return n == 1 ? msgid : msgid_plural;
+    return (char *)(n == 1 ? msgid : msgid_plural);
 }
 
 /*ARGSUSED*/

src/testdir/Make_all.mak

@@ -154,7 +154,7 @@ SCRIPTS_WIN32 = test50.out
 
 
 # Tests for the GUI.
-SCRIPTS_GUI = test16.out
+SCRIPTS_GUI =
 
 
 # Tests using runtest.vim.vim.
@@ -171,6 +171,7 @@ NEW_TESTS = test_arglist.res \
 	    test_digraph.res \
 	    test_farsi.res \
 	    test_gn.res \
+	    test_gui.res \
 	    test_hardcopy.res \
 	    test_history.res \
 	    test_increment.res \

src/testdir/Make_vms.mms

@@ -4,7 +4,7 @@
 # Authors:	Zoltan Arpadffy, <[email protected]>
 #		Sandor Kopanyi,  <[email protected]>
 #
-# Last change:  2016 Feb 25
+# Last change:  2016 Aug 04
 #
 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
 # Edit the lines in the Configuration section below to select.
@@ -104,7 +104,7 @@ SCRIPT = $(SCRIPTS_ALL) $(SCRIPTS_MORE3)
 # On ODS-2 tests fail. 
 
 .IFDEF WANT_GUI
-SCRIPT_GUI = test16.out
+SCRIPT_GUI = 
 GUI_OPTION = -g
 .ENDIF
 

src/testdir/runtest.vim

@@ -131,7 +131,7 @@ else
 endif
 
 " Names of flaky tests.
-let s:flaky = ['Test_reltime()', 'Test_nb_basic()']
+let s:flaky = ['Test_reltime()', 'Test_nb_basic()', 'Test_communicate()']
 
 " Locate Test_ functions and execute them.
 set nomore

src/testdir/test16.in

@@ -0,0 +1,28 @@
+" Tests specifically for the GUI
+
+if !has('gui') || ($DISPLAY == "" && !has('gui_running'))
+  finish
+endif
+
+" For KDE set a font, empty 'guifont' may cause a hang.
+func SetUp()
+  if has("gui_kde")
+    set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0
+  endif
+endfunc
+
+" Test for resetting "secure" flag after GUI has started.
+" Must be run first.
+func Test_1_set_secure()
+  set exrc secure
+  gui -f
+  call assert_equal(1, has('gui_running'))
+endfunc
+
+func Test_shell_command()
+  new
+  r !echo hello
+  call assert_equal('hello', substitute(getline(2), '\W', '', 'g'))
+  bwipe!
+  call assert_true(1, match(execute('winpos'), 'Window position: X \d\+, Y \d\+') >= 0)
+endfunc

src/testdir/test16.ok

@@ -778,6 +778,14 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2156,
+/**/
+    2155,
+/**/
+    2154,
+/**/
+    2153,
 /**/
     2152,
 /**/