(child_setup_tty): Handle systems with NLDLY, without FFDLY.

diff --git a/src/ChangeLog b/src/ChangeLog
index 795819b75eba642e29689ae0c1d0e90622d732f4..d1ffac62b539a4d33b61deb1683fa5e3a885daf4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-17  Glenn Morris  <rgm@gnu.org>
+
+       * sysdep.c (child_setup_tty): Handle systems with NLDLY, without FFDLY.
+
 2008-05-16  Eli Zaretskii  <eliz@gnu.org>
 
        * dired.c (Ffile_attributes): Shut up GCC warnings about st_uid

diff --git a/src/sysdep.c b/src/sysdep.c
index f4922944ba4029c609c8628d8eeb9dbd26fe12e9..6c3e0e4a54ed85366b679b75482fa13832396186 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -600,8 +600,15 @@ child_setup_tty (out)
   s.main.c_oflag |= OPOST;     /* Enable output postprocessing */
   s.main.c_oflag &= ~ONLCR;    /* Disable map of NL to CR-NL on output */
 #ifdef NLDLY
+  /* http://lists.gnu.org/archive/html/emacs-devel/2008-05/msg00406.html
+     Some versions of GNU Hurd do not have FFDLY?  */
+#ifdef FFDLY
   s.main.c_oflag &= ~(NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY);
                                /* No output delays */
+#else
+  s.main.c_oflag &= ~(NLDLY|CRDLY|TABDLY|BSDLY|VTDLY);
+                               /* No output delays */
+#endif
 #endif
   s.main.c_lflag &= ~ECHO;     /* Disable echo */
   s.main.c_lflag |= ISIG;      /* Enable signals */