comparison src/xdisp.c @ 28206:07ac059dece0

(handle_single_display_prop): Initialize local `value'. (try_window_reusing_current_matrix): Don't call scroll run function if run's current and desired position are the same; this prevents cursor flickering.

28205:1592a7956ed3

      /* Characters having this form of property are not displayed, so
         we have to find the end of the property.  */
      space_or_image_found_p = 1;
      start_pos = *position;
      *position = display_prop_end (it, object, start_pos);

      /* Let's stop at the new position and assume that all
	 text properties change there.  */
      it->stop_charpos = position->charpos;

     int which;
     int (*fn) ();
     int a1, a2, a3, a4, a5;
{
  Lisp_Object buffer;
  int i, this_one, the_other, clear_buffer_p, rc;
  int count = specpdl_ptr - specpdl;

  /* If buffers aren't life, make new ones.  */
  ensure_echo_area_buffers ();

	  w->current_matrix->buffer = b;
	  w->current_matrix->begv = BUF_BEGV (b);
	  w->current_matrix->zv = BUF_ZV (b);
	}
      
      update_mode_lines = 0;
      windows_or_buffers_changed = 0;
    }

  /* Start SIGIO interrupts coming again.  Having them off during the

      
      /* Try to redisplay starting at same place as before.
         If point has not moved off frame, accept the results.  */
      if (!current_matrix_up_to_date_p
	  /* Don't use try_window_reusing_current_matrix in this case
	     because it can have changed the buffer.  */
	  || !NILP (Vwindow_scroll_functions)
	  || MINI_WINDOW_P (w)
	  || !try_window_reusing_current_matrix (w))
	{
	  IF_DEBUG (debug_method_add (w, "1"));

	     current matrix to get the height of the row the cursor is
	     in.  */
	  run.current_y = first_row_y;
	  run.desired_y = it.current_y;
	  run.height = it.last_visible_y - it.current_y;
	  if (run.height > 0)
	    {
	      update_begin (f);
	      rif->update_window_begin_hook (w);
	      rif->scroll_run_hook (w, &run);
	      rif->update_window_end_hook (w, 0);

28206:07ac059dece0

      /* Characters having this form of property are not displayed, so
         we have to find the end of the property.  */
      space_or_image_found_p = 1;
      start_pos = *position;
      *position = display_prop_end (it, object, start_pos);
      value = Qnil;

      /* Let's stop at the new position and assume that all
	 text properties change there.  */
      it->stop_charpos = position->charpos;

     int which;
     int (*fn) ();
     int a1, a2, a3, a4, a5;
{
  Lisp_Object buffer;
  int this_one, the_other, clear_buffer_p, rc;
  int count = specpdl_ptr - specpdl;

  /* If buffers aren't life, make new ones.  */
  ensure_echo_area_buffers ();

	  w->current_matrix->buffer = b;
	  w->current_matrix->begv = BUF_BEGV (b);
	  w->current_matrix->zv = BUF_ZV (b);
	}

      update_mode_lines = 0;
      windows_or_buffers_changed = 0;
    }

  /* Start SIGIO interrupts coming again.  Having them off during the

      
      /* Try to redisplay starting at same place as before.
         If point has not moved off frame, accept the results.  */
      if (!current_matrix_up_to_date_p
	  /* Don't use try_window_reusing_current_matrix in this case
	     because a window scroll function can have changed the
	     buffer.  */
	  || !NILP (Vwindow_scroll_functions)
	  || MINI_WINDOW_P (w)
	  || !try_window_reusing_current_matrix (w))
	{
	  IF_DEBUG (debug_method_add (w, "1"));

	     current matrix to get the height of the row the cursor is
	     in.  */
	  run.current_y = first_row_y;
	  run.desired_y = it.current_y;
	  run.height = it.last_visible_y - it.current_y;
	  if (run.height > 0
	      && run.current_y != run.desired_y)
	    {
	      update_begin (f);
	      rif->update_window_begin_hook (w);
	      rif->scroll_run_hook (w, &run);
	      rif->update_window_end_hook (w, 0);