2 files changed, 4 insertions, 3 deletions

diff --git a/src/cm.c b/src/cm.c
index 95aa6afdcd6..1094e3047d6 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -70,7 +70,8 @@ cmputc (c)
 {
   if (TTY_TERMSCRIPT (current_tty))
     putc (c & 0177, TTY_TERMSCRIPT (current_tty));
-  putc (c & 0177, TTY_OUTPUT (current_tty));
+  if (putc (c & 0177, TTY_OUTPUT (current_tty)) == EOF)
+      abort ();                 /* XXX For testing only! */
   return c;
 }
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 217cc290464..1bb9564060f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6689,7 +6689,7 @@ read_avail_input (expected)
                 if (! tty_list->next)
                   kill (0, SIGHUP); /* This was the last terminal. */
                 else
-                  ;             /* XXX tty should be closed here. */
+                  delete_tty (tty); /* XXX I wonder if this is safe here. */
               }
 #if defined (AIX) && (! defined (aix386) && defined (_BSD))
             /* The kernel sometimes fails to deliver SIGHUP for ptys.
@@ -6701,7 +6701,7 @@ read_avail_input (expected)
                 if (! tty_list->next)
                   kill (0, SIGHUP); /* This was the last terminal. */
                 else
-                  ;             /* XXX tty should be closed here. */
+                  delete_tty (tty); /* XXX I wonder if this is safe here. */
               }
 #endif
           }