comparison src/xdisp.c @ 108089:2bdfb77de643

Fix display of composed characters from L2R scripts in bidi buffers. (Bug#5977) xdisp.c (set_iterator_to_next, next_element_from_composition): After advancing IT past the composition, resync the bidi iterator with IT's position.

108087:076e73b014a5

	reseat_at_next_visible_line_start (it, 0);
      else if (it->cmp_it.id >= 0)
	{
	  IT_CHARPOS (*it) += it->cmp_it.nchars;
	  IT_BYTEPOS (*it) += it->cmp_it.nbytes;
	  if (it->cmp_it.to < it->cmp_it.nglyphs)
	    it->cmp_it.from = it->cmp_it.to;
	  else
	    {
	      it->cmp_it.id = -1;

    {
      if (it->c < 0)
	{
	  IT_CHARPOS (*it) += it->cmp_it.nchars;
	  IT_BYTEPOS (*it) += it->cmp_it.nbytes;
	  return 0;
	}
      it->position = it->current.pos;
      it->object = it->w->buffer;
      it->c = composition_update_it (&it->cmp_it, IT_CHARPOS (*it),

108089:2bdfb77de643

	reseat_at_next_visible_line_start (it, 0);
      else if (it->cmp_it.id >= 0)
	{
	  IT_CHARPOS (*it) += it->cmp_it.nchars;
	  IT_BYTEPOS (*it) += it->cmp_it.nbytes;
	  if (it->bidi_p)
	    {
	      if (it->bidi_it.new_paragraph)
		bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
	      /* Resync the bidi iterator with IT's new position.
		 FIXME: this doesn't support bidirectional text.  */
	      while (it->bidi_it.charpos < IT_CHARPOS (*it))
		bidi_get_next_char_visually (&it->bidi_it);
	    }
	  if (it->cmp_it.to < it->cmp_it.nglyphs)
	    it->cmp_it.from = it->cmp_it.to;
	  else
	    {
	      it->cmp_it.id = -1;

    {
      if (it->c < 0)
	{
	  IT_CHARPOS (*it) += it->cmp_it.nchars;
	  IT_BYTEPOS (*it) += it->cmp_it.nbytes;
	  if (it->bidi_p)
	    {
	      if (it->bidi_it.new_paragraph)
		bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it);
	      /* Resync the bidi iterator with IT's new position.
		 FIXME: this doesn't support bidirectional text.  */
	      while (it->bidi_it.charpos < IT_CHARPOS (*it))
		bidi_get_next_char_visually (&it->bidi_it);
	    }
	  return 0;
	}
      it->position = it->current.pos;
      it->object = it->w->buffer;
      it->c = composition_update_it (&it->cmp_it, IT_CHARPOS (*it),