]> code.delx.au - gnu-emacs/commitdiff
Don't block in set-process-window-size
authorAlain Schneble <a.s@realize.ch>
Tue, 16 Feb 2016 02:13:06 +0000 (13:13 +1100)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 16 Feb 2016 02:13:06 +0000 (13:13 +1100)
* 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.

src/process.c

index 778378349169ad448443f39bf0c61a7323a4eacd..9c09aeefa6be62c724eaee540d4cb275e7259a74 100644 (file)
@@ -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))