comparison src/xdisp.c @ 10416:51c4308d74c9

(message_log_need_newline): New var. (message_dolog): New function, extracted from message2.

10415:72031f772d96

extern int interrupt_input;
extern int command_loop_level;

extern Lisp_Object Qface;

/* Nonzero means print newline before next minibuffer message.  */

int noninteractive_need_newline;

#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))

/* The buffer position of the first character appearing

/* Number of lines to keep in the message log buffer.
   t means infinite.  nil means don't log at all.  */
Lisp_Object Vmessage_log_max;

/* Display an echo area message M with a specified length of LEN chars.
   The string may include null characters.  If m is 0, clear out any
   existing message, and let the minibuffer text show through.
   Do not pass text that is stored in a Lisp string.  */

void
message2 (m, len)
     char *m;
     int len;
{
  if (m && !NILP (Vmessage_log_max))
    {
      struct buffer *oldbuf;
      int oldpoint, oldbegv, oldzv;

      oldbuf = current_buffer;
      Fset_buffer (Fget_buffer_create (build_string (" *Messages*")));
      oldpoint = PT;
      oldbegv = BEGV;
      oldzv = ZV;
      if (oldpoint == Z)
	oldpoint += len + 1;
      if (oldzv == Z)
	oldzv += len + 1;
      TEMP_SET_PT (Z);
      insert_1 (m, len, 1, 0);
      insert_1 ("\n", 1, 1, 0);
      if (NATNUMP (Vmessage_log_max))
	{
	  Lisp_Object n;
	  XSETINT (n, -XFASTINT (Vmessage_log_max));
	  Fforward_line (n);

      BEGV = oldbegv;
      ZV = oldzv;
      TEMP_SET_PT (oldpoint);
      set_buffer_internal (oldbuf);
    }
  message2_nolog (m, len);
}


/* The non-logging part of that function.  */

10416:51c4308d74c9

extern int interrupt_input;
extern int command_loop_level;

extern Lisp_Object Qface;

/* Nonzero means print newline to stdout before next minibuffer message.  */

int noninteractive_need_newline;

/* Nonzero means print newline to message log before next message.  */

int message_log_need_newline;

#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))

/* The buffer position of the first character appearing

/* Number of lines to keep in the message log buffer.
   t means infinite.  nil means don't log at all.  */
Lisp_Object Vmessage_log_max;

/* Add a string to the message log, optionally terminated with a newline.  */

void
message_dolog (m, len, nlflag)
     char *m;
     int len, nlflag;
{
  if (!NILP (Vmessage_log_max))
    {
      struct buffer *oldbuf;
      int oldpoint, oldbegv, oldzv;

      oldbuf = current_buffer;
      Fset_buffer (Fget_buffer_create (build_string (" *Messages*")));
      oldpoint = PT;
      oldbegv = BEGV;
      oldzv = ZV;
      if (oldpoint == Z)
	oldpoint += len + nlflag;
      if (oldzv == Z)
	oldzv += len + nlflag;
      TEMP_SET_PT (Z);
      if (len)
	insert_1 (m, len, 1, 0);
      if (nlflag)
	insert_1 ("\n", 1, 1, 0);
      if (NATNUMP (Vmessage_log_max))
	{
	  Lisp_Object n;
	  XSETINT (n, -XFASTINT (Vmessage_log_max));
	  Fforward_line (n);

      BEGV = oldbegv;
      ZV = oldzv;
      TEMP_SET_PT (oldpoint);
      set_buffer_internal (oldbuf);
    }
}


/* Display an echo area message M with a specified length of LEN chars.
   The string may include null characters.  If m is 0, clear out any
   existing message, and let the minibuffer text show through.
   Do not pass text that is stored in a Lisp string.  */

void
message2 (m, len)
     char *m;
     int len;
{
  /* First flush out any partial line written with print.  */
  if (message_log_need_newline)
    message_dolog ("", 0, 1);
  message_log_need_newline = 0;
  if (m)
    message_dolog (m, len, 1);
  message2_nolog (m, len);
}


/* The non-logging part of that function.  */