2 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bc8dbe3b919..8e98815d8ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,12 +1,20 @@
 2000-06-14  Gerd Moellmann  <gerd@gnu.org>
 
+        * xdisp.c (setup_echo_area_for_printing): Call
+        message_log_maybe_newline if message_buf_print is not set.
+
+        * print.c (printchar, strout): Don't check message_buf_print
+        before calling setup_echo_area_for_printing because that 
+        function does something useful even when message_buf_print is
+        already set.
+
         * xdisp.c (message_truncate_lines, Qmessage_truncate_lines): New
         variables.
         (ensure_echo_area_buffers): Initialize echo buffer's
         truncate lines setting to nil.
         (with_echo_area_buffer): Don't set the echo buffer's truncate
         lines setting here.
-        (set_message_1): Set it here, instead, based on the value
+        (set_message_1): Set it here instead, based on the value
         of message_truncate_lines.
         (resize_mini_window): Handle case that lines are truncated.
         (syms_of_xdisp): Initialize Qmessage_truncate_lines.  DEFVAR_BOOL
diff --git a/src/xdisp.c b/src/xdisp.c
index be76987311e..68e915f0272 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5520,6 +5520,7 @@ setup_echo_area_for_printing (multibyte_p)
           Fraise_frame  (WINDOW_FRAME (XWINDOW (mini_window)));
         }
 
+      message_log_maybe_newline ();
       message_buf_print = 1;
     }
   else