comparison src/intervals.c @ 45781:d65729232269

(textget): Don't forget to `return'. (lookup_char_property): Use XCAR/XCDR.

45780:d850bd75235f

Lisp_Object
textget (plist, prop)
     Lisp_Object plist;
     register Lisp_Object prop;
{
  lookup_char_property (plist, prop, 1);
}

Lisp_Object
lookup_char_property (plist, prop, textprop)
     Lisp_Object plist;
     register Lisp_Object prop;
     int textprop;
{
  register Lisp_Object tail, fallback = Qnil;

  for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
    {
      register Lisp_Object tem;
      tem = Fcar (tail);
      if (EQ (prop, tem))
	return Fcar (Fcdr (tail));
      if (EQ (tem, Qcategory))
	{
	  tem = Fcar (Fcdr (tail));
	  if (SYMBOLP (tem))
	    fallback = Fget (tem, prop);
	}
    }

  /* Check for alternative properties */
  tail = Fassq (prop, Vchar_property_alias_alist);
  if (NILP (tail))
    return tail;
  tail = XCDR (tail);
  for (; NILP (fallback) && !NILP (tail); tail = XCDR (tail))
    {
      if (!CONSP (tail))
	wrong_type_argument (Qlistp, tail);
      fallback = Fplist_get (plist, XCAR (tail));
    }
  if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties))
    fallback = Fplist_get (Vdefault_text_properties, prop);
  return fallback;
}

45781:d65729232269

Lisp_Object
textget (plist, prop)
     Lisp_Object plist;
     register Lisp_Object prop;
{
  return lookup_char_property (plist, prop, 1);
}

Lisp_Object
lookup_char_property (plist, prop, textprop)
     Lisp_Object plist;
     register Lisp_Object prop;
     int textprop;
{
  register Lisp_Object tail, fallback = Qnil;

  for (tail = plist; CONSP (tail); tail = Fcdr (XCDR (tail)))
    {
      register Lisp_Object tem;
      tem = XCAR (tail);
      if (EQ (prop, tem))
	return Fcar (XCDR (tail));
      if (EQ (tem, Qcategory))
	{
	  tem = Fcar (XCDR (tail));
	  if (SYMBOLP (tem))
	    fallback = Fget (tem, prop);
	}
    }

  /* Check for alternative properties */
  tail = Fassq (prop, Vchar_property_alias_alist);
  if (NILP (tail))
    return tail;
  tail = XCDR (tail);
  for (; NILP (fallback) && CONSP (tail); tail = XCDR (tail))
    fallback = Fplist_get (plist, XCAR (tail));
  if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties))
    fallback = Fplist_get (Vdefault_text_properties, prop);
  return fallback;
}