diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-01-27 19:30:46 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-01-27 19:30:46 +0000 |
| commit | 5448351795f1bd2d760eaefb4e1ea71344323295 (patch) | |
| tree | b0919e333c5a440382dddf4db9efba2d74249f56 /src/print.c | |
| parent | 37d01c60bdb10b8632b2ac542ca14def8f190edc (diff) | |
| download | emacs-5448351795f1bd2d760eaefb4e1ea71344323295.tar.gz | |
(printchar, strout): Use message_log_maybe_newline.
Leave all of the newline bookkeeping to message_dolog.
Diffstat (limited to 'src/print.c')
| -rw-r--r-- | src/print.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/print.c b/src/print.c index 8f8b6090595..c276a2d7eda 100644 --- 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); |