comparison src/xfaces.c @ 83291:bbf359ec4a59

Merged from [e-mail]--gnu-2005 (patch 269) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-269 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-331

83290:042f282a2ed7

static Lisp_Object
resolve_face_name (face_name)
     Lisp_Object face_name;
{
  Lisp_Object aliased;
  Lisp_Object args[2];
  int c = 0;

  if (STRINGP (face_name))
    face_name = intern (SDATA (face_name));

  /* Protect against loops by limiting the number of indirections.  */
  while (SYMBOLP (face_name) && c < 10)
    {
      /* Fget can signal an error; just ignore it.  */
      args[0] = face_name;
      args[1] = Qface_alias;
      aliased = internal_condition_case_2 (internal_resolve_face_name, 2, args, Qt,
                                           resolve_face_name_error);
      if (NILP (aliased))
	break;
      else
	face_name = aliased;
      c++;
    }

  return face_name;
}

83291:bbf359ec4a59

static Lisp_Object
resolve_face_name (face_name)
     Lisp_Object face_name;
{
  Lisp_Object aliased;
  int alias_loop_max = 10;

  if (STRINGP (face_name))
    face_name = intern (SDATA (face_name));

  while (SYMBOLP (face_name))
    {
      aliased = Fsafe_get (face_name, Qface_alias);
      if (NILP (aliased))
	break;
      if (--alias_loop_max == 0)
	break;
      face_name = aliased;
    }

  return face_name;
}