2 files changed, 14 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e62c833c3e6..cb41750a62c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * sysdep.c (child_setup_tty): Move the non-canonical initialization to
+        the HAVE_TERMIO where it belongs (bug#6149).
+
 2010-05-30  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_move_to_visually_next): Make sure the sentinel
diff --git a/src/sysdep.c b/src/sysdep.c
index 1e114655b4e..46169b28e1f 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -537,15 +537,6 @@ child_setup_tty (out)
   s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
 #endif /* AIX */
 
-#else /* not HAVE_TERMIO */
-
-  s.main.sg_flags &= ~(ECHO | CRMOD | ANYP | ALLDELAY | RAW | LCASE
-                       | CBREAK | TANDEM);
-  s.main.sg_flags |= LPASS8;
-  s.main.sg_erase = 0377;
-  s.main.sg_kill = 0377;
-  s.lmode = LLITOUT | s.lmode;        /* Don't strip 8th bit */
-
   /* We used to enable ICANON (and set VEOF to 04), but this leads to
      problems where process.c wants to send EOFs every once in a while
      to force the output, which leads to weird effects when the
@@ -558,6 +549,15 @@ child_setup_tty (out)
   s.main.c_cc[VMIN] = 1;
   s.main.c_cc[VTIME] = 0;
 
+#else /* not HAVE_TERMIO */
+
+  s.main.sg_flags &= ~(ECHO | CRMOD | ANYP | ALLDELAY | RAW | LCASE
+                       | CBREAK | TANDEM);
+  s.main.sg_flags |= LPASS8;
+  s.main.sg_erase = 0377;
+  s.main.sg_kill = 0377;
+  s.lmode = LLITOUT | s.lmode;        /* Don't strip 8th bit */
+
 #endif /* not HAVE_TERMIO */
 
   EMACS_SET_TTY (out, &s, 0);