comparison src/xdisp.c @ 110647:c294bdb9cef3

Fix bug #7128. xdisp.c (reseat_1): Initialize bidi_it.paragraph_dir to NEUTRAL_DIR. (handle_invisible_prop, iterate_out_of_display_property) (next_element_from_buffer): If bidi_it.first_elt is set, call bidi_paragraph_init with NO_DEFAULT_P argument non-zero.

110646:167af2298656

		     to do it now because next_element_from_buffer may
		     not have a chance to do it, if we are going to
		     skip any text at the beginning, which resets the
		     FIRST_ELT flag.  */
		  bidi_paragraph_init (it->paragraph_embedding,
				       &it->bidi_it, 0);
		}
	      do
		{
		  bidi_move_to_visually_next (&it->bidi_it);
		}

{
  /* Maybe initialize paragraph direction.  If we are at the beginning
     of a new paragraph, next_element_from_buffer may not have a
     chance to do that.  */
  if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV)
    bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
  /* prev_stop can be zero, so check against BEGV as well.  */
  while (it->bidi_it.charpos >= BEGV
	 && it->prev_stop <= it->bidi_it.charpos
	 && it->bidi_it.charpos < CHARPOS (it->position))
    bidi_move_to_visually_next (&it->bidi_it);

  it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
  it->sp = 0;
  it->string_from_display_prop_p = 0;
  it->face_before_selective_p = 0;
  if (it->bidi_p)
    it->bidi_it.first_elt = 1;

  if (set_stop_p)
    {
      it->stop_charpos = CHARPOS (pos);
      it->base_level_stop = CHARPOS (pos);

	  || FETCH_CHAR (it->bidi_it.bytepos - 1) == '\n'
	  || FETCH_CHAR (it->bidi_it.bytepos) == '\n')
	{
	  /* If we are at the beginning of a line, we can produce the
	     next element right away.  */
	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
	  bidi_move_to_visually_next (&it->bidi_it);
	}
      else
	{
	  EMACS_INT orig_bytepos = IT_BYTEPOS (*it);

	     element.  */
	  IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it), -1);
	  IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
	  it->bidi_it.charpos = IT_CHARPOS (*it);
	  it->bidi_it.bytepos = IT_BYTEPOS (*it);
	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 0);
	  do
	    {
	      /* Now return to buffer position where we were asked to
		 get the next display element, and produce that.  */
	      bidi_move_to_visually_next (&it->bidi_it);

110647:c294bdb9cef3

		     to do it now because next_element_from_buffer may
		     not have a chance to do it, if we are going to
		     skip any text at the beginning, which resets the
		     FIRST_ELT flag.  */
		  bidi_paragraph_init (it->paragraph_embedding,
				       &it->bidi_it, 1);
		}
	      do
		{
		  bidi_move_to_visually_next (&it->bidi_it);
		}

{
  /* Maybe initialize paragraph direction.  If we are at the beginning
     of a new paragraph, next_element_from_buffer may not have a
     chance to do that.  */
  if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV)
    bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 1);
  /* prev_stop can be zero, so check against BEGV as well.  */
  while (it->bidi_it.charpos >= BEGV
	 && it->prev_stop <= it->bidi_it.charpos
	 && it->bidi_it.charpos < CHARPOS (it->position))
    bidi_move_to_visually_next (&it->bidi_it);

  it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
  it->sp = 0;
  it->string_from_display_prop_p = 0;
  it->face_before_selective_p = 0;
  if (it->bidi_p)
    {
      it->bidi_it.first_elt = 1;
      it->bidi_it.paragraph_dir = NEUTRAL_DIR;
    }

  if (set_stop_p)
    {
      it->stop_charpos = CHARPOS (pos);
      it->base_level_stop = CHARPOS (pos);

	  || FETCH_CHAR (it->bidi_it.bytepos - 1) == '\n'
	  || FETCH_CHAR (it->bidi_it.bytepos) == '\n')
	{
	  /* If we are at the beginning of a line, we can produce the
	     next element right away.  */
	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 1);
	  bidi_move_to_visually_next (&it->bidi_it);
	}
      else
	{
	  EMACS_INT orig_bytepos = IT_BYTEPOS (*it);

	     element.  */
	  IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it), -1);
	  IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
	  it->bidi_it.charpos = IT_CHARPOS (*it);
	  it->bidi_it.bytepos = IT_BYTEPOS (*it);
	  bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 1);
	  do
	    {
	      /* Now return to buffer position where we were asked to
		 get the next display element, and produce that.  */
	      bidi_move_to_visually_next (&it->bidi_it);