2 files changed, 7 insertions, 3 deletions

diff --git a/README.multi-tty b/README.multi-tty
index 7a9ed1fdada..5deb706c3c8 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -35,6 +35,7 @@ Bernard Adrian <bernadrian@free.fr>
 ARISAWA Akihiro <ari@mbf.ocn.ne.jp>
 Vincent Bernat <bernat@luffy.cx>
 Han Boetes <han@mijncomputer.nl>
+Francisco Borges <borges@let.rug.nl>
 Damien Cassou <damien.cassou@laposte.net>
 Robert J. Chassell <bob@rattlesnake.com>
 Romain Francoise <romain@orebokech.com>
@@ -52,8 +53,8 @@ Gergely Nagy <algernon@debian.org>
 Dan Nicolaescu <dann@ics.uci.edu>
 Kalle Olavi Niemitalo <kon@iki.fi>
 Mark Plaksin <happy@mcplaksin.org>
-Francisco Borges <borges@let.rug.nl>
 Frank Ruell <stoerte@dreamwarrior.net>
+Tom Schutzer-Weissmann <trmsw@yahoo.co.uk>
 Dan Waber <dwaber@logolalia.com>
 and many others.
 
@@ -392,6 +393,9 @@ is probably not very interesting for anyone else.)
 THINGS TO DO
 ------------
 
+** Emacs crashes when a tty frame is resized so that there is no space
+   for all its windows.  (Tom Schutzer-Weissmann)
+
 ** Report GTK multi-display problems to GTK maintainers.  For extra
    credit, fix them.
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 095400eb70d..0de517c5293 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6050,7 +6050,7 @@ window_change_signal (signalnum) /* If we don't have an argument, */
 #ifndef USE_CRT_DLL
   extern int errno;
 #endif
-  int old_errno = errno;
+  int old_errno = errno;x
 
   struct tty_display_info *tty;
 
@@ -6068,7 +6068,7 @@ window_change_signal (signalnum) /* If we don't have an argument, */
 
     get_tty_size (fileno (tty->input), &width, &height);
     
-    {
+    if (width > 5 && height > 2) {
       Lisp_Object tail, frame;
       
       FOR_EACH_FRAME (tail, frame)