comparison src/xdisp.c @ 107615:937f2da537a4

Recompute prev_stop and base_level_stop when the iterator is repositioned to a different location. xdisp.c (handle_stop_backwards): Add a prototype. (reseat): call handle_stop_backwards to recompute prev_stop and base_level_stop for the new position. Solves the crash when scrolling backwards.

107614:0dc1757dc6b9

static int text_outside_line_unchanged_p P_ ((struct window *, int, int));
static void store_mode_line_noprop_char P_ ((char));
static int store_mode_line_noprop P_ ((const unsigned char *, int, int));
static void x_consider_frame_title P_ ((Lisp_Object));
static void handle_stop P_ ((struct it *));
static int tool_bar_lines_needed P_ ((struct frame *, int *));
static int single_display_spec_intangible_p P_ ((Lisp_Object));
static void ensure_echo_area_buffers P_ ((void));
static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object));
static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *));

  /* Determine where to check text properties.  Avoid doing it
     where possible because text property lookup is very expensive.  */
  if (force_p
      || CHARPOS (pos) > it->stop_charpos
      || CHARPOS (pos) < original_pos)
    handle_stop (it);

  CHECK_IT (it);
}

	      embedding level, so test for that explicitly.  */
	   && !BIDI_AT_BASE_LEVEL (it->bidi_it)
	   && IT_CHARPOS (*it) < it->prev_stop)
    {
      if (it->base_level_stop <= 0)
	it->base_level_stop = 1;
      if (IT_CHARPOS (*it) < it->base_level_stop)
	abort ();
      handle_stop_backwards (it, it->base_level_stop);
      return GET_NEXT_DISPLAY_ELEMENT (it);
    }

107615:937f2da537a4

static int text_outside_line_unchanged_p P_ ((struct window *, int, int));
static void store_mode_line_noprop_char P_ ((char));
static int store_mode_line_noprop P_ ((const unsigned char *, int, int));
static void x_consider_frame_title P_ ((Lisp_Object));
static void handle_stop P_ ((struct it *));
static void handle_stop_backwards P_ ((struct it *, EMACS_INT));
static int tool_bar_lines_needed P_ ((struct frame *, int *));
static int single_display_spec_intangible_p P_ ((Lisp_Object));
static void ensure_echo_area_buffers P_ ((void));
static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object));
static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *));

  /* Determine where to check text properties.  Avoid doing it
     where possible because text property lookup is very expensive.  */
  if (force_p
      || CHARPOS (pos) > it->stop_charpos
      || CHARPOS (pos) < original_pos)
    {
      if (it->bidi_p)
	{
	  /* For bidi iteration, we need to prime prev_stop and
	     base_level_stop with our best estimations.  */
	  if (CHARPOS (pos) < it->prev_stop)
	    {
	      handle_stop_backwards (it, BEGV);
	      if (CHARPOS (pos) < it->base_level_stop)
		it->base_level_stop = 0;
	    }
	  else if (CHARPOS (pos) > it->stop_charpos
		   && it->stop_charpos >= BEGV)
	    handle_stop_backwards (it, it->stop_charpos);
	  else	/* force_p */
	    handle_stop (it);
	}
      else
	{
	  handle_stop (it);
	  it->prev_stop = it->base_level_stop = 0;
	}

    }

  CHECK_IT (it);
}

	      embedding level, so test for that explicitly.  */
	   && !BIDI_AT_BASE_LEVEL (it->bidi_it)
	   && IT_CHARPOS (*it) < it->prev_stop)
    {
      if (it->base_level_stop <= 0)
	it->base_level_stop = BEGV;
      if (IT_CHARPOS (*it) < it->base_level_stop)
	abort ();
      handle_stop_backwards (it, it->base_level_stop);
      return GET_NEXT_DISPLAY_ELEMENT (it);
    }