# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 955372464 0
# Node ID 918f12c5c8e3d03f2ae9dd3c673e978699d4ccfd
# Parent  cfc50753fa50d419edd87968f2e69e3bcc32b1cc
(setup_echo_area_for_printing): Choose an echo
area buffer, if it's not set up yet.

diff -r cfc50753fa50 -r 918f12c5c8e3 src/xdisp.c
--- a/src/xdisp.c	Mon Apr 10 11:45:52 2000 +0000
+++ b/src/xdisp.c	Mon Apr 10 13:14:24 2000 +0000
@@ -5480,9 +5480,20 @@
 
       message_buf_print = 1;
     }
-  else if (current_buffer != XBUFFER (echo_area_buffer[0]))
-    /* Someone switched buffers between print requests.  */
-    set_buffer_internal (XBUFFER (echo_area_buffer[0]));
+  else
+    {
+      if (NILP (echo_area_buffer[0]))
+	{
+	  if (EQ (echo_area_buffer[1], echo_buffer[0]))
+	    echo_area_buffer[0] = echo_buffer[1]; 
+	  else
+	    echo_area_buffer[0] = echo_buffer[0];
+	}
+      
+      if (current_buffer != XBUFFER (echo_area_buffer[0]))
+	/* Someone switched buffers between print requests.  */
+	set_buffer_internal (XBUFFER (echo_area_buffer[0]));
+    }
 }
 
 
@@ -10264,7 +10275,7 @@
   /* Scroll the display.  Do it before changing the current matrix so
      that xterm.c doesn't get confused about where the cursor glyph is
      found.  */
-  if (dy)
+  if (dy && run.height)
     {
       update_begin (f);