comparison src/xfaces.c @ 5084:863e092a5891

(compute_char_face): Accept new arg LIMIT. Pass Fnext_single_property_change its new arg LIMIT.

5083:37fecb3bf8d9

   Store into *ENDPTR the position at which a different face is needed.
   This does not take account of glyphs that specify their own face codes.
   F is the frame in use for display, and W is a window displaying
   the current buffer.

   REGION_BEG, REGION_END delimit the region, so it can be highlighted.  */

int
compute_char_face (f, w, pos, region_beg, region_end, endptr)
     struct frame *f;
     struct window *w;
     int pos;
     int region_beg, region_end;
     int *endptr;
{
  struct face face;
  Lisp_Object prop, position;
  int i, j, noverlays;
  int facecode;

    endpos = region_beg;

  XFASTINT (position) = pos;
  prop = Fget_text_property (position, Qface, w->buffer);
  {
    Lisp_Object end;

    end = Fnext_single_property_change (position, Qface, w->buffer);
    if (INTEGERP (end))
      endpos = XINT (end);
  }

  {

5084:863e092a5891

   Store into *ENDPTR the position at which a different face is needed.
   This does not take account of glyphs that specify their own face codes.
   F is the frame in use for display, and W is a window displaying
   the current buffer.

   REGION_BEG, REGION_END delimit the region, so it can be highlighted.

   LIMIT is a position not to scan beyond.  That is to limit
   the time this function can take.  */

int
compute_char_face (f, w, pos, region_beg, region_end, endptr, limit)
     struct frame *f;
     struct window *w;
     int pos;
     int region_beg, region_end;
     int *endptr;
     int limit;
{
  struct face face;
  Lisp_Object prop, position;
  int i, j, noverlays;
  int facecode;

    endpos = region_beg;

  XFASTINT (position) = pos;
  prop = Fget_text_property (position, Qface, w->buffer);
  {
    Lisp_Object limit1, end;

    XFASTINT (limit1) = (limit < endpos ? limit : endpos);
    end = Fnext_single_property_change (position, Qface, w->buffer, limit1);
    if (INTEGERP (end))
      endpos = XINT (end);
  }

  {