comparison src/fontset.c @ 90725:6d8c81691fc8

(Finternal_char_font): Fix previous change.

90724:96bde39d99b2

  int face_id;
  int c;
  struct frame *f;
  struct face *face;
  Lisp_Object charset, rfont_def;
  int charset_id;

  if (NILP (position))
    {
      CHECK_CHARACTER (ch);
      c = XINT (ch);
      f = XFRAME (selected_frame);
      face_id = DEFAULT_FACE_ID;
      pos = -1;
      charset_id = -1;
    }
  else
    {
      Lisp_Object window, charset;
      struct window *w;

      w = XWINDOW (window);
      f = XFRAME (w->frame);
      face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0);
      charset = Fget_char_property (position, Qcharset, Qnil);
      if (CHARSETP (charset))
	charset_id = XINT (CHARSET_SYMBOL_ID (charset));
      else
	charset_id = -1;
    }
  if (! CHAR_VALID_P (c, 0))
    return Qnil;
  face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil);
  face = FACE_FROM_ID (f, face_id);
  rfont_def = fontset_font (FONTSET_FROM_ID (face->fontset), c, face,
			    charset_id);
#ifdef USE_FONT_BACKEND
  if (enable_font_backend)
    {
      if (VECTORP (rfont_def) && ! NILP (AREF (rfont_def, 4)))
	{

90725:6d8c81691fc8

  int face_id;
  int c;
  struct frame *f;
  struct face *face;
  Lisp_Object charset, rfont_def;
  int cs_id;

  if (NILP (position))
    {
      CHECK_CHARACTER (ch);
      c = XINT (ch);
      f = XFRAME (selected_frame);
      face_id = DEFAULT_FACE_ID;
      pos = -1;
      cs_id = -1;
    }
  else
    {
      Lisp_Object window, charset;
      struct window *w;

      w = XWINDOW (window);
      f = XFRAME (w->frame);
      face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0);
      charset = Fget_char_property (position, Qcharset, Qnil);
      if (CHARSETP (charset))
	cs_id = XINT (CHARSET_SYMBOL_ID (charset));
      else
	cs_id = -1;
    }
  if (! CHAR_VALID_P (c, 0))
    return Qnil;
  face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil);
  face = FACE_FROM_ID (f, face_id);
  rfont_def = fontset_font (FONTSET_FROM_ID (face->fontset), c, face, cs_id);
#ifdef USE_FONT_BACKEND
  if (enable_font_backend)
    {
      if (VECTORP (rfont_def) && ! NILP (AREF (rfont_def, 4)))
	{