mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-18 00:50:44 -08:00
Code Issues Projects Releases Wiki Activity

(printchar, strout): Use message_log_maybe_newline.

Browse source 
Leave all of the newline bookkeeping to message_dolog.
This commit is contained in:
Karl Heuer 1995-01-27 19:30:46 +00:00
parent 3c6595e0b2
commit aee72e4fb5
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/print.c
View file

@ -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);