Fix C-g during `make-network-process'. (Reported by Mark Plaksin.)

* src/process.c (Fmake_network_process): Don't unrequest_sigio on modern
  systems.

* src/keyboard.c (Fset_input_interrupt_mode): Cosmetic change.

* src/sysdep.c (request_sigio): Make it a no-op if noninteractive.
  (unrequest_sigio): Make it a no-op if noninteractive.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-494

1 files changed, 7 insertions, 10 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index 956323f3a3b..25db4c73080 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1037,12 +1037,8 @@ reset_sigio (fd)
 void
 request_sigio ()
 {
-  /* XXX read_socket_hook is not global anymore.  Is blocking SIGIO
-     bad under X? */
-#if 0
-  if (noninteractive || read_socket_hook)
+  if (noninteractive)
     return;
-#endif
 
 #ifdef SIGWINCH
   sigunblock (sigmask (SIGWINCH));
@@ -1055,13 +1051,14 @@ request_sigio ()
 void
 unrequest_sigio (void)
 { 
-  /* XXX read_socket_hook is not global anymore.  Is blocking SIGIO
-     bad under X? */
-#if 0
-  if (noninteractive || read_socket_hook)
+  if (noninteractive)
+    return;
+
+#if 0 /* XXX What's wrong with blocking SIGIO under X?  */
+  if (x_display_list)
     return;
 #endif
-  
+
 #ifdef SIGWINCH
   sigblock (sigmask (SIGWINCH));
 #endif