comparison src/xdisp.c @ 25820:a18595261196

(display_prop_end, invisible_text_between_p): Use next_single_char_property_change.

25819:c2163b0bac24

  return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY;
}


/* Value is the position of the end of the `display' property stating
   at START_POS in OBJECT.  */

static struct text_pos
display_prop_end (it, object, start_pos)
     struct it *it;
     Lisp_Object object;
     struct text_pos start_pos;
{
  Lisp_Object end;
  struct text_pos end_pos;
  
  /* Characters having this form of property are not displayed, so
     we have to find the end of the property.  */
  end = Fnext_single_property_change (make_number (start_pos.charpos),
				      Qdisplay, object, Qnil);
  if (NILP (end))
    {
      /* A nil value of `end' means there are no changes of the
	 property to the end of the buffer or string.  */
      if (it->current.overlay_string_index >= 0)
	end_pos.charpos = XSTRING (it->string)->size;
      else
	end_pos.charpos = it->end_charpos;
    }
  else
    end_pos.charpos = XFASTINT (end);

  if (STRINGP (it->string))
    compute_string_pos (&end_pos, start_pos, it->string);
  else
    end_pos.bytepos = CHAR_TO_BYTE (end_pos.charpos);

  return end_pos;
}

			     it->window);
  if (TEXT_PROP_MEANS_INVISIBLE (prop))
    invisible_found_p = 1;
  else
    {
      limit = Fnext_single_property_change (make_number (start_charpos),
					    Qinvisible,
					    Fcurrent_buffer (),
					    make_number (end_charpos));
      invisible_found_p = XFASTINT (limit) < end_charpos;
    }

  return invisible_found_p;
  

25820:a18595261196

  return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY;
}


/* Value is the position of the end of the `display' property starting
   at START_POS in OBJECT.  */

static struct text_pos
display_prop_end (it, object, start_pos)
     struct it *it;
     Lisp_Object object;
     struct text_pos start_pos;
{
  Lisp_Object end;
  struct text_pos end_pos;

  end = next_single_char_property_change (make_number (CHARPOS (start_pos)),
					  Qdisplay, object, Qnil);
  CHARPOS (end_pos) = XFASTINT (end);
  if (STRINGP (object))
    compute_string_pos (&end_pos, start_pos, it->string);
  else
    BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end));

  return end_pos;
}

			     it->window);
  if (TEXT_PROP_MEANS_INVISIBLE (prop))
    invisible_found_p = 1;
  else
    {
      limit = next_single_char_property_change (make_number (start_charpos),
						Qinvisible, Qnil,
						make_number (end_charpos));
      invisible_found_p = XFASTINT (limit) < end_charpos;
    }

  return invisible_found_p;