From: Alain Schneble <a.s@realize.ch>
Date: Tue, 16 Feb 2016 02:13:06 +0000 (+1100)
Subject: Don't block in set-process-window-size
X-Git-Tag: emacs-26.0.90~2520^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4324bdf565fd934afa7558d4356f040d3a66c6e;p=emacs.git

Don't block in set-process-window-size

* src/process.c (set-process-window-size): Explicitly return Qnil when
called with network processes as set_window_size won't work anyway on
socket fds.  As a welcome side effect, this makes the blocking
wait_for_socket_fds call obsolete.
---

diff --git a/src/process.c b/src/process.c
index 77837834916..9c09aeefa6b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1115,14 +1115,12 @@ DEFUN ("set-process-window-size", Fset_process_window_size,
 {
   CHECK_PROCESS (process);
 
-  if (NETCONN_P (process))
-    wait_for_socket_fds (process, "set-process-window-size");
-
   /* All known platforms store window sizes as 'unsigned short'.  */
   CHECK_RANGED_INTEGER (height, 0, USHRT_MAX);
   CHECK_RANGED_INTEGER (width, 0, USHRT_MAX);
 
-  if (XPROCESS (process)->infd < 0
+  if (NETCONN_P (process)
+      || XPROCESS (process)->infd < 0
       || (set_window_size (XPROCESS (process)->infd,
 			   XINT (height), XINT (width))
 	  < 0))