(printchar, strout): Use message_log_maybe_newline.

Leave all of the newline bookkeeping to message_dolog.

diff --git a/src/print.c b/src/print.c
index 8f8b60905958bd6d56b56d6a11eaf828e331c600..c276a2d7edadf06cd74a868bc501fe0a15cfbc1a 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -70,11 +70,6 @@ Lisp_Object Qprint_escape_newlines;
 
 extern int noninteractive_need_newline;
 
-/* Nonzero means print newline to message log before next message.
-   Defined in xdisp.c */
-
-extern int message_log_need_newline;
-
 #ifdef MAX_PRINT_CHARS
 static int print_chars;
 static int max_print;
@@ -212,9 +207,7 @@ printchar (ch, fun)
       if (echo_area_glyphs != FRAME_MESSAGE_BUF (mini_frame)
          || !message_buf_print)
        {
-         if (message_log_need_newline)
-           message_dolog ("", 0, 1);
-         message_log_need_newline = 0;
+         message_log_maybe_newline ();
          echo_area_glyphs = FRAME_MESSAGE_BUF (mini_frame);
          printbufidx = 0;
          echo_area_glyphs_length = 0;
@@ -222,7 +215,6 @@ printchar (ch, fun)
        }
 
       message_dolog (&ch, 1, 0);
-      message_log_need_newline = 1;
       if (printbufidx < FRAME_WIDTH (mini_frame) - 1)
        FRAME_MESSAGE_BUF (mini_frame)[printbufidx++] = ch;
       FRAME_MESSAGE_BUF (mini_frame)[printbufidx] = 0;
@@ -274,9 +266,7 @@ strout (ptr, size, printcharfun)
       if (echo_area_glyphs != FRAME_MESSAGE_BUF (mini_frame)
          || !message_buf_print)
        {
-         if (message_log_need_newline)
-           message_dolog ("", 0, 1);
-         message_log_need_newline = 0;
+         message_log_maybe_newline ();
          echo_area_glyphs = FRAME_MESSAGE_BUF (mini_frame);
          printbufidx = 0;
          echo_area_glyphs_length = 0;
@@ -284,7 +274,6 @@ strout (ptr, size, printcharfun)
        }
 
       message_dolog (ptr, i, 0);
-      message_log_need_newline = 1;
       if (i > FRAME_WIDTH (mini_frame) - printbufidx - 1)
        i = FRAME_WIDTH (mini_frame) - printbufidx - 1;
       bcopy (ptr, &FRAME_MESSAGE_BUF (mini_frame) [printbufidx], i);