Merged from miles@gnu.org--gnu-2005 (patch 593-595)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-593
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-594
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-595
   Update from CVS

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

diff --cc lisp/startup.el
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/sysdep.c
index c9464cd,3bc72c5..0cf6ecb
--- 1/src/sysdep.c
--- 2/src/sysdep.c
+++ b/src/sysdep.c
@@@ -1031,17 -1008,12 +1031,18 @@@ reset_sigio (fd
  }
  
  #ifdef FASYNC         /* F_SETFL does not imply existence of FASYNC */
 +/* XXX Uhm, FASYNC is not used anymore here. */
++/* XXX Yeah, but you need it for SIGIO, don't you? */
  
  void
  request_sigio ()
  {
-   if (read_socket_hook)
 +  /* XXX read_socket_hook is not global anymore.  Is blocking SIGIO
 +     bad under X? */
 +#if 0
+   if (noninteractive || read_socket_hook)
      return;
 +#endif
  
  #ifdef SIGWINCH
    sigunblock (sigmask (SIGWINCH));
@@@ -1052,15 -1024,11 +1053,15 @@@
  }
  
  void
 -unrequest_sigio ()
 -{
 +unrequest_sigio (void)
 +{ 
 +  /* XXX read_socket_hook is not global anymore.  Is blocking SIGIO
 +     bad under X? */
 +#if 0
-   if (read_socket_hook)
+   if (noninteractive || read_socket_hook)
      return;
 -
 +#endif
 +  
  #ifdef SIGWINCH
    sigblock (sigmask (SIGWINCH));
  #endif
@@@ -1076,11 -1044,10 +1077,11 @@@ request_sigio (
  {
    int on = 1;
  
-   if (read_socket_hook)
+   if (noninteractive || read_socket_hook)
      return;
  
 -  ioctl (input_fd, FIOASYNC, &on);
 +  /* XXX CURTTY() is bogus here. */
 +  ioctl (fileno (CURTTY ()->input), FIOASYNC, &on);
    interrupts_deferred = 0;
  }
  
@@@ -1089,11 -1056,10 +1090,11 @@@ unrequest_sigio (
  {
    int off = 0;
  
-   if (read_socket_hook)
+   if (noninteractive || read_socket_hook)
      return;
  
 -  ioctl (input_fd, FIOASYNC, &off);
 +  /* XXX CURTTY() is bogus here. */
 +  ioctl (fileno (CURTTY ()->input), FIOASYNC, &off);
    interrupts_deferred = 1;
  }
  
@@@ -1124,10 -1090,10 +1125,10 @@@ unrequest_sigio (
  {
    int off = 0;
  
-   if (read_socket_hook)
+   if (noninteractive || read_socket_hook)
      return;
  
 -  ioctl (input_fd, FIOASYNC, &off);
 +  ioctl (0, FIOASYNC, &off);  /* XXX This fails for multiple ttys. */
    interrupts_deferred = 1;
  }
  

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge