2 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 795819b75eb..d1ffac62b53 100644
--- 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 f4922944ba4..6c3e0e4a54e 100644
--- 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 */