comparison src/xfaces.c @ 89844:02a959f3ee57

(build_scalable_font_name): If the scalable font is requested for a specific size, don't change that size. (try_font_list): Try a scalable font also in the case that a pattern string is specified,

89843:69acbaa5b570

  char pixel_size[20];
  int pixel_value;
  double resy = FRAME_X_DISPLAY_INFO (f)->resy;
  double pt;

  /* If scalable font is for a specific resolution, compute
     the point size we must specify from the resolution of
     the display and the specified resolution of the font.  */
  if (font->numeric[XLFD_RESY] != 0)
    {

     struct font_name **fonts;
{
  int nfonts = 0;

  if (STRINGP (pattern))
    nfonts = font_list (f, pattern, Qnil, Qnil, fonts);
  else
    {
      Lisp_Object tail;

      if (NILP (family))

89844:02a959f3ee57

  char pixel_size[20];
  int pixel_value;
  double resy = FRAME_X_DISPLAY_INFO (f)->resy;
  double pt;

  if (font->numeric[XLFD_PIXEL_SIZE] != 0
      || font->numeric[XLFD_POINT_SIZE] != 0)
    /* This is a scalable font but is requested for a specific size.
       We should not change that size.  */
    return build_font_name (font);

  /* If scalable font is for a specific resolution, compute
     the point size we must specify from the resolution of
     the display and the specified resolution of the font.  */
  if (font->numeric[XLFD_RESY] != 0)
    {

     struct font_name **fonts;
{
  int nfonts = 0;

  if (STRINGP (pattern))
    {
      nfonts = font_list (f, pattern, Qnil, Qnil, fonts);
      if (nfonts == 0 && ! EQ (Vscalable_fonts_allowed, Qt))
	{
	  int count = SPECPDL_INDEX ();
	  specbind (Qscalable_fonts_allowed, Qt);
	  nfonts = font_list (f, pattern, Qnil, Qnil, fonts);
	  unbind_to (count, Qnil);
	}
    }
  else
    {
      Lisp_Object tail;

      if (NILP (family))