Merge remote-tracking branch 'vim/master'

Author: splhack

src/os_unix.c

@@ -511,7 +511,7 @@ mch_inchar(
 		|| interrupted
 #endif
 		|| wait_time > 0
-		|| !did_start_blocking)
+		|| (wtime < 0 && !did_start_blocking))
 	    continue;
 
 	/* no character available or interrupted */

src/testdir/test_clientserver.vim

@@ -11,13 +11,15 @@ func Test_client_server()
   if cmd == ''
     return
   endif
-  if has('unix')
+  if has('x11')
+    if empty($DISPLAY)
+      throw 'Skipped: $DISPLAY is not set'
+    endif
     try
       call remote_send('xxx', '')
     catch
       if v:exception =~ 'E240:'
-	" No connection to the X server, give up.
-	return
+	throw 'Skipped: no connection to the X server'
       endif
       " ignore other errors
     endtry

src/testdir/test_quotestar.vim

@@ -118,8 +118,12 @@ func Test_quotestar()
 
   if has('macunix')
     let skipped = Do_test_quotestar_for_macunix()
-  elseif !empty("$DISPLAY")
-    let skipped = Do_test_quotestar_for_x11()
+  elseif has('x11')
+    if empty($DISPLAY)
+      let skipped = "Test can only run when $DISPLAY is set."
+    else
+      let skipped = Do_test_quotestar_for_x11()
+    endif
   else
     let skipped = "Test is not implemented yet for this platform."
   endif

src/version.c

@@ -779,6 +779,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    512,
+/**/
+    511,
 /**/
     510,
 /**/