comparison src/xdisp.c @ 10764:a3e635f3501e

(redisplay_window): If we update the mode line, switch to the buffer for real, and switch back for real.

10763:d5a22f90865d

  register int startp;
  register int hscroll = XINT (w->hscroll);
  struct position pos;
  int opoint = PT;
  int tem;
  int window_needs_modeline;

  if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */

  /* If this is a combination window, do its children; that's all.  */

	  
	  goto finish_scroll_bars;
	}
    }

  if (update_mode_lines)
    w->update_mode_line = Qt;

  /* Otherwise set up data on this window; select its buffer and point value */

  set_buffer_temp (XBUFFER (w->buffer));
  opoint = PT;

  /* Count number of windows showing the selected buffer.
     An indirect buffer counts as its base buffer.  */

     unless the specified location is outside the accessible range.  */
  if (!NILP (w->force_start))
    {
      /* Forget any recorded base line for line number display.  */
      w->base_line_number = Qnil;
      w->update_mode_line = Qt;
      w->force_start = Qnil;
      XSETFASTINT (w->last_modified, 0);
      if (startp < BEGV) startp = BEGV;
      if (startp > ZV)   startp = ZV;
      try_window (window, startp);

      else
	cancel_my_columns (w);
    }

  XSETFASTINT (w->last_modified, 0);
  w->update_mode_line = Qt;

  /* Try to scroll by specified few lines */

  if (scroll_step && !clip_changed)
    {

  startp = marker_position (w->start);
  w->start_at_line_beg 
    = (startp == BEGV || FETCH_CHAR (startp - 1) == '\n') ? Qt : Qnil;

done:
  if ((!NILP (w->update_mode_line)
       /* If window not full width, must redo its mode line
	  if the window to its side is being redone */
       || (!just_this_one && width < FRAME_WIDTH (f) - 1)
       || INTEGERP (w->base_line_pos)
       || (!NILP (w->column_number_displayed)

      w->base_line_pos = Qnil;
      w->base_line_number = Qnil;
    }

  /* When we reach a frame's selected window, redo the frame's menu bar.  */
  if (!NILP (w->update_mode_line)
#ifdef USE_X_TOOLKIT
      && FRAME_EXTERNAL_MENU_BAR (f) 
#else
      && FRAME_MENU_BAR_LINES (f) > 0
#endif

	 so it shouldn't be deleted at the end of redisplay.  */
      (*redeem_scroll_bar_hook) (w);
    }

  BUF_PT (current_buffer) = opoint;
  set_buffer_temp (old);
  BUF_PT (current_buffer) = lpoint;
}

/* Do full redisplay on one window, starting at position `pos'. */

10764:a3e635f3501e

  register int startp;
  register int hscroll = XINT (w->hscroll);
  struct position pos;
  int opoint = PT;
  int tem;
  int update_mode_line;

  if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */

  /* If this is a combination window, do its children; that's all.  */

	  
	  goto finish_scroll_bars;
	}
    }

  update_mode_line = (!NILP (w->update_mode_line) || update_mode_lines);

  /* Otherwise set up data on this window; select its buffer and point value */

  if (update_mode_line)
    set_buffer_internal (XBUFFER (w->buffer));
  else
    set_buffer_temp (XBUFFER (w->buffer));

  opoint = PT;

  /* Count number of windows showing the selected buffer.
     An indirect buffer counts as its base buffer.  */

     unless the specified location is outside the accessible range.  */
  if (!NILP (w->force_start))
    {
      /* Forget any recorded base line for line number display.  */
      w->base_line_number = Qnil;
      /* Redisplay the mode line.  Select the buffer properly for that.  */
      if (!update_mode_line)
	{
	  set_buffer_temp (old);
	  set_buffer_internal (XBUFFER (w->buffer));
	  update_mode_line = 1;
	  w->update_mode_line = Qt;
	}
      w->force_start = Qnil;
      XSETFASTINT (w->last_modified, 0);
      if (startp < BEGV) startp = BEGV;
      if (startp > ZV)   startp = ZV;
      try_window (window, startp);

      else
	cancel_my_columns (w);
    }

  XSETFASTINT (w->last_modified, 0);
  /* Redisplay the mode line.  Select the buffer properly for that.  */
  if (!update_mode_line)
    {
      set_buffer_temp (old);
      set_buffer_internal (XBUFFER (w->buffer));
      update_mode_line = 1;
      w->update_mode_line = Qt;
    }

  /* Try to scroll by specified few lines */

  if (scroll_step && !clip_changed)
    {

  startp = marker_position (w->start);
  w->start_at_line_beg 
    = (startp == BEGV || FETCH_CHAR (startp - 1) == '\n') ? Qt : Qnil;

done:
  if ((update_mode_line
       /* If window not full width, must redo its mode line
	  if the window to its side is being redone */
       || (!just_this_one && width < FRAME_WIDTH (f) - 1)
       || INTEGERP (w->base_line_pos)
       || (!NILP (w->column_number_displayed)

      w->base_line_pos = Qnil;
      w->base_line_number = Qnil;
    }

  /* When we reach a frame's selected window, redo the frame's menu bar.  */
  if (update_mode_line
#ifdef USE_X_TOOLKIT
      && FRAME_EXTERNAL_MENU_BAR (f) 
#else
      && FRAME_MENU_BAR_LINES (f) > 0
#endif

	 so it shouldn't be deleted at the end of redisplay.  */
      (*redeem_scroll_bar_hook) (w);
    }

  BUF_PT (current_buffer) = opoint;
  if (update_mode_line)
    set_buffer_internal (old);
  else
    set_buffer_temp (old);
  BUF_PT (current_buffer) = lpoint;
}

/* Do full redisplay on one window, starting at position `pos'. */