comparison src/xdisp.c @ 109990:7ab569e9f738

xdisp.c (compute_stop_pos): Pay attention to bidi scan direction on calling composition_compute_stop_pos.

109988:ae3fecdc3276

static void
compute_stop_pos (struct it *it)
{
  register INTERVAL iv, next_iv;
  Lisp_Object object, limit, position;
  EMACS_INT charpos, bytepos;

  /* If nowhere else, stop at the end.  */
  it->stop_charpos = it->end_charpos;

  if (STRINGP (it->string))

	    /* Text properties change in next_iv.  */
	    it->stop_charpos = min (it->stop_charpos, next_iv->position);
	}
    }

  composition_compute_stop_pos (&it->cmp_it, charpos, bytepos,
				it->stop_charpos, it->string);

  xassert (STRINGP (it->string)
	   || (it->stop_charpos >= BEGV
	       && it->stop_charpos >= IT_CHARPOS (*it)));
}

109990:7ab569e9f738

static void
compute_stop_pos (struct it *it)
{
  register INTERVAL iv, next_iv;
  Lisp_Object object, limit, position;
  EMACS_INT charpos, bytepos, stoppos;

  /* If nowhere else, stop at the end.  */
  it->stop_charpos = it->end_charpos;

  if (STRINGP (it->string))

	    /* Text properties change in next_iv.  */
	    it->stop_charpos = min (it->stop_charpos, next_iv->position);
	}
    }

  if (it->bidi_p && it->bidi_it.scan_dir < 0)
    stoppos = -1;
  else
    stoppos = it->stop_charpos;
  composition_compute_stop_pos (&it->cmp_it, charpos, bytepos,
				stoppos, it->string);

  xassert (STRINGP (it->string)
	   || (it->stop_charpos >= BEGV
	       && it->stop_charpos >= IT_CHARPOS (*it)));
}