comparison src/xfaces.c @ 103054:c98dbbb65bad

(Fx_list_fonts): If a font size is specified in PATTERN, set it in returned scalable fonts.

103053:384db4f6fc8a

	Ffont_put (font_spec, QCsize, make_number (size));
	Ffont_put (font_spec, QCavgwidth, make_number (avgwidth));
      }
    args[0] = Flist_fonts (font_spec, frame, maximum, font_spec);
    for (tail = args[0]; CONSP (tail); tail = XCDR (tail))
      XSETCAR (tail, Ffont_xlfd_name (XCAR (tail), Qnil));
    if (NILP (frame))
      /* We don't have to check fontsets.  */
      return args[0];
    args[1] = list_fontsets (f, pattern, size);
    return Fnconc (2, args);

103054:c98dbbb65bad

	Ffont_put (font_spec, QCsize, make_number (size));
	Ffont_put (font_spec, QCavgwidth, make_number (avgwidth));
      }
    args[0] = Flist_fonts (font_spec, frame, maximum, font_spec);
    for (tail = args[0]; CONSP (tail); tail = XCDR (tail))
      {
	Lisp_Object font_entity;

	font_entity = XCAR (tail);
	if ((NILP (AREF (font_entity, FONT_SIZE_INDEX))
	     || XINT (AREF (font_entity, FONT_SIZE_INDEX)) == 0)
	    && ! NILP (AREF (font_spec, FONT_SIZE_INDEX)))
	  {
	    /* This is a scalable font.  For backward compatibility,
	       we set the specified size. */
	    font_entity = Fcopy_font_spec (font_entity);
	    ASET (font_entity, FONT_SIZE_INDEX,
		  AREF (font_spec, FONT_SIZE_INDEX));
	  }
	XSETCAR (tail, Ffont_xlfd_name (font_entity, Qnil));
      }
    if (NILP (frame))
      /* We don't have to check fontsets.  */
      return args[0];
    args[1] = list_fontsets (f, pattern, size);
    return Fnconc (2, args);