comparison src/xfaces.c @ 95377:0c4bba8ae9f2

(Fx_family_fonts): Set frame correctly.

95376:3b1db88e82f9

The result list is sorted according to the current setting of
the face font sort order.  */)
     (family, frame)
     Lisp_Object family, frame;
{
  struct frame *f = check_x_frame (frame);
  Lisp_Object font_spec = Qnil, vec;
  int i, nfonts;
  Lisp_Object result;

  if (!NILP (family))
    {
      CHECK_STRING (family);
      font_spec = Ffont_spec (0, NULL);
      Ffont_put (font_spec, QCfamily, family);
    }
  vec = font_list_entities (frame, font_spec);
  nfonts = ASIZE (vec);
  if (nfonts == 0)

      Lisp_Object spacing;

      ASET (v, 0, AREF (font, FONT_FAMILY_INDEX));
      ASET (v, 1, FONT_WIDTH_SYMBOLIC (font));
      point = PIXEL_TO_POINT (XINT (AREF (font, FONT_SIZE_INDEX)) * 10,
			      f->resy);
      ASET (v, 2, make_number (point));
      ASET (v, 3, FONT_WEIGHT_SYMBOLIC (font));
      ASET (v, 4, FONT_SLANT_SYMBOLIC (font));
      spacing = Ffont_get (font, QCspacing);
      ASET (v, 5, (NILP (spacing) || EQ (spacing, Qp)) ? Qnil : Qt);
      ASET (v, 6, AREF (font, FONT_NAME_INDEX));
      ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX));

      result = Fcons (v, result);
    }

95377:0c4bba8ae9f2

The result list is sorted according to the current setting of
the face font sort order.  */)
     (family, frame)
     Lisp_Object family, frame;
{
  Lisp_Object font_spec, vec;
  int i, nfonts;
  Lisp_Object result;

  if (NILP (frame))
    frame = selected_frame;
  CHECK_LIVE_FRAME (frame);

  font_spec = Ffont_spec (0, NULL);
  if (!NILP (family))
    {
      CHECK_STRING (family);
      Ffont_put (font_spec, QCfamily, family);
    }
  vec = font_list_entities (frame, font_spec);
  nfonts = ASIZE (vec);
  if (nfonts == 0)

      Lisp_Object spacing;

      ASET (v, 0, AREF (font, FONT_FAMILY_INDEX));
      ASET (v, 1, FONT_WIDTH_SYMBOLIC (font));
      point = PIXEL_TO_POINT (XINT (AREF (font, FONT_SIZE_INDEX)) * 10,
			      XFRAME (frame)->resy);
      ASET (v, 2, make_number (point));
      ASET (v, 3, FONT_WEIGHT_SYMBOLIC (font));
      ASET (v, 4, FONT_SLANT_SYMBOLIC (font));
      spacing = Ffont_get (font, QCspacing);
      ASET (v, 5, (NILP (spacing) || EQ (spacing, Qp)) ? Qnil : Qt);
      ASET (v, 6, Ffont_xlfd_name (font, Qnil));
      ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX));

      result = Fcons (v, result);
    }