comparison src/xdisp.c @ 11444:763c454b044e

(redisplay): Call init_desired_glyphs for each frame. Call prepare_menu_bars. (prepare_menu_bars): Delete code at beginning that duplicates things done at the beginning of redisplay. (message_log_check_duplicate): Make p1 and p2 unsigned char *.

11443:188edd08d761

/* We are at the end of the buffer after just having inserted a newline.
   (Note: We depend on the fact we won't be crossing the gap.)
   Check to see if the most recent message looks a lot like the previous one.
   Return 0 if different, 1 if the new one should just replace it, or a
   value N > 1 if we should also append " [N times]".  */
static int
message_log_check_duplicate (prev_bol, this_bol)
     int prev_bol, this_bol;
{
  int i;
  int len = Z - 1 - this_bol;
  int seen_dots = 0;
  char *p1 = BUF_CHAR_ADDRESS (current_buffer, prev_bol);
  char *p2 = BUF_CHAR_ADDRESS (current_buffer, this_bol);

  for (i = 0; i < len; i++)
    {
      if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.'
	  && p1[i] != '\n')

{
  register struct window *w = XWINDOW (selected_window);
  int all_windows;
  struct gcpro gcpro1, gcpro2;

  if (noninteractive)
    return;

  /* Set the visible flags for all frames.
     Do this before checking for resized or garbaged frames; they want
     to know if their frames are visible.
     See the comment in frame.h for FRAME_SAMPLE_VISIBILITY.  */
  {
    Lisp_Object tail, frame;

    FOR_EACH_FRAME (tail, frame)
      FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
  }

  /* Notice any pending interrupt request to change frame size.  */
  do_pending_window_change ();

  if (frame_garbaged)
    {
      redraw_garbaged_frames ();
      frame_garbaged = 0;
    }

  all_windows = (update_mode_lines || buffer_shared > 1
		 || clip_changed || windows_or_buffers_changed);

  /* Update the menu bar item lists, if appropriate.
     This has to be done before any actual redisplay

     See the comment in frame.h for FRAME_SAMPLE_VISIBILITY.  */
  {
    Lisp_Object tail, frame;

    FOR_EACH_FRAME (tail, frame)
      FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
  }

  /* Notice any pending interrupt request to change frame size.  */
  do_pending_window_change ();

  if (frame_garbaged)
    {
      redraw_garbaged_frames ();
      frame_garbaged = 0;
    }

  if (clip_changed || windows_or_buffers_changed
      || (!NILP (w->column_number_displayed)
	  && XFASTINT (w->column_number_displayed) != current_column ()))
    update_mode_lines++;

11444:763c454b044e

/* We are at the end of the buffer after just having inserted a newline.
   (Note: We depend on the fact we won't be crossing the gap.)
   Check to see if the most recent message looks a lot like the previous one.
   Return 0 if different, 1 if the new one should just replace it, or a
   value N > 1 if we should also append " [N times]".  */

static int
message_log_check_duplicate (prev_bol, this_bol)
     int prev_bol, this_bol;
{
  int i;
  int len = Z - 1 - this_bol;
  int seen_dots = 0;
  unsigned char *p1 = BUF_CHAR_ADDRESS (current_buffer, prev_bol);
  unsigned char *p2 = BUF_CHAR_ADDRESS (current_buffer, this_bol);

  for (i = 0; i < len; i++)
    {
      if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.'
	  && p1[i] != '\n')

{
  register struct window *w = XWINDOW (selected_window);
  int all_windows;
  struct gcpro gcpro1, gcpro2;

  all_windows = (update_mode_lines || buffer_shared > 1
		 || clip_changed || windows_or_buffers_changed);

  /* Update the menu bar item lists, if appropriate.
     This has to be done before any actual redisplay

     See the comment in frame.h for FRAME_SAMPLE_VISIBILITY.  */
  {
    Lisp_Object tail, frame;

    FOR_EACH_FRAME (tail, frame)
      {
	FRAME_SAMPLE_VISIBILITY (XFRAME (frame));

	/* Clear out all the display lines in which we will generate the
	   glyphs to display.  */
	init_desired_glyphs (XFRAME (frame));
      }
  }

  /* Notice any pending interrupt request to change frame size.  */
  do_pending_window_change ();

  if (frame_garbaged)
    {
      redraw_garbaged_frames ();
      frame_garbaged = 0;
    }

  prepare_menu_bars ();

  if (clip_changed || windows_or_buffers_changed
      || (!NILP (w->column_number_displayed)
	  && XFASTINT (w->column_number_displayed) != current_column ()))
    update_mode_lines++;