comparison src/xdisp.c @ 29445:cb3ad8f8f0ed

(redisplay_window): Always use set_buffer_internal_1.

29444:cab67467450d

  int update_mode_line;
  int tem;
  struct it it;
  /* Record it now because it's overwritten.  */
  int current_matrix_up_to_date_p = 0;
  int really_switched_buffer = 0;
  int temp_scroll_step = 0;
  int count = specpdl_ptr - specpdl;

  SET_TEXT_POS (lpoint, PT, PT_BYTE);
  opoint = lpoint;

	}
    }

  /* Otherwise set up data on this window; select its buffer and point
     value.  */
  if (update_mode_line)
    {
      /* Really select the buffer, for the sake of buffer-local
         variables.  */
      set_buffer_internal_1 (XBUFFER (w->buffer));
      really_switched_buffer = 1;
    }
  else
    set_buffer_temp (XBUFFER (w->buffer));
  SET_TEXT_POS (opoint, PT, PT_BYTE);

  current_matrix_up_to_date_p
    = (!NILP (w->window_end_valid)
       && !current_buffer->clip_changed

	 than to get into an infinite loop calling the hook functions
	 and having them get more errors.  */
      if (!update_mode_line
	  || ! NILP (Vwindow_scroll_functions))
	{
	  if (!really_switched_buffer)
	    {
	      set_buffer_temp (old);
	      set_buffer_internal_1 (XBUFFER (w->buffer));
	      really_switched_buffer = 1;
	    }
	  
	  update_mode_line = 1;
	  w->update_mode_line = Qt;
	  startp = run_window_scroll_functions (window, startp);
	}
      

  XSETFASTINT (w->last_overlay_modified, 0);

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

  /* Try to scroll by specified few lines.  */

    {
      Lisp_Object old_selected_frame;
      
      old_selected_frame = selected_frame;
      
      if (!really_switched_buffer)
	{
	  set_buffer_temp (old);
	  set_buffer_internal_1 (XBUFFER (w->buffer));
	  really_switched_buffer = 1;
	}
      
      XSETFRAME (selected_frame, f);
      display_mode_lines (w);
      selected_frame = old_selected_frame;

      /* If mode line height has changed, arrange for a thorough

 restore_buffers:

  /* Restore current_buffer and value of point in it.  */
  TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
  if (really_switched_buffer)
    set_buffer_internal_1 (old);
  else
    set_buffer_temp (old);
  TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));

  unbind_to (count, Qnil);
}

29445:cb3ad8f8f0ed

  int update_mode_line;
  int tem;
  struct it it;
  /* Record it now because it's overwritten.  */
  int current_matrix_up_to_date_p = 0;
  int temp_scroll_step = 0;
  int count = specpdl_ptr - specpdl;

  SET_TEXT_POS (lpoint, PT, PT_BYTE);
  opoint = lpoint;

	}
    }

  /* Otherwise set up data on this window; select its buffer and point
     value.  */
  /* Really select the buffer, for the sake of buffer-local
     variables.  */
  set_buffer_internal_1 (XBUFFER (w->buffer));
  SET_TEXT_POS (opoint, PT, PT_BYTE);

  current_matrix_up_to_date_p
    = (!NILP (w->window_end_valid)
       && !current_buffer->clip_changed

	 than to get into an infinite loop calling the hook functions
	 and having them get more errors.  */
      if (!update_mode_line
	  || ! NILP (Vwindow_scroll_functions))
	{
	  update_mode_line = 1;
	  w->update_mode_line = Qt;
	  startp = run_window_scroll_functions (window, startp);
	}
      

  XSETFASTINT (w->last_overlay_modified, 0);

  /* Redisplay the mode line.  Select the buffer properly for that.  */
  if (!update_mode_line)
    {
      update_mode_line = 1;
      w->update_mode_line = Qt;
    }

  /* Try to scroll by specified few lines.  */

    {
      Lisp_Object old_selected_frame;
      
      old_selected_frame = selected_frame;
      
      XSETFRAME (selected_frame, f);
      display_mode_lines (w);
      selected_frame = old_selected_frame;

      /* If mode line height has changed, arrange for a thorough

 restore_buffers:

  /* Restore current_buffer and value of point in it.  */
  TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
  set_buffer_internal_1 (old);
  TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));

  unbind_to (count, Qnil);
}